diff --git a/checks/conventional-mdc.test b/checks/conventional-mdc.test
index 3da5d26df..171cb6244 100755
--- a/checks/conventional-mdc.test
+++ b/checks/conventional-mdc.test
@@ -9,6 +9,7 @@ for ciph in `all_cipher_algos`; do
     # *BSD's dd can't cope with a count of 0
     if test "$i" = "0"; then
         : >z
+        my_chtag z
     else
         dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
     fi
diff --git a/checks/defs.inc b/checks/defs.inc
index ce05ff590..080db3b45 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -112,6 +112,17 @@ echo_n () {
 #    cleanup_files="$cleanup_files $*"
 #}
 
+
+# Special function for zOS.
+my_chtag () {
+  #FIXME: Is there an envvar to test for the OS or do we 
+  #       need to resort to a configure test
+  #if test "$FOO" = "bar"; then
+  #   chtag -tc ISO8859-1 $1
+  #fi
+  :
+}
+
 have_pubkey_algo () {
   if  ../g10/gpg --homedir .  --version | grep "Pubkey:.*$1" >/dev/null
   then
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9993fef40..feb13aa52 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-13  Werner Koch  <wk@g10code.com>
+
+	* gpgv.texi, gpg.texi: Udpate from GnuPG-2.
+
 2008-04-30  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg-zip.1: Add man page thanks to Colin Tuckley and Daniel
diff --git a/doc/gpg.texi b/doc/gpg.texi
index cc048b1db..94616ee32 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,5 +1,5 @@
-@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-@c               2007 Free Software Foundation, Inc.
+@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+@c               2008, 2009 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
@@ -149,7 +149,7 @@ cannot abbreviate this command.
 @itemx -h
 @opindex help
 Print a usage message summarizing the most useful command line options.
-Not that you cannot abbreviate this command.
+Note that you cannot abbreviate this command.
 
 @item --warranty
 @opindex warranty
@@ -175,18 +175,23 @@ abbreviate this command.
 @itemx -s
 @opindex sign
 Make a signature. This command may be combined with @option{--encrypt}
-(for a signed and encrypted message), @option{--symmetric} (for a signed
-and symmetrically encrypted message), or @option{--encrypt} and
+(for a signed and encrypted message), @option{--symmetric} (for a
+signed and symmetrically encrypted message), or @option{--encrypt} and
 @option{--symmetric} together (for a signed message that may be
-decrypted via a secret key or a passphrase).
+decrypted via a secret key or a passphrase).  The key to be used for
+signing is chosen by default or can be set with the
+@option{--local-user} and @option{--default-key} options.
 
 @item --clearsign
 @opindex clearsign
-Make a clear text signature. The content in a clear text signature is
-readable without any special software. OpenPGP software is only
-needed to verify the signature. Clear text signatures may modify
-end-of-line whitespace for platform independence and are not intended
-to be reversible.
+Make a clear text signature.  The content in a clear text signature is
+readable without any special software. OpenPGP software is only needed
+to verify the signature.  Clear text signatures may modify end-of-line
+whitespace for platform independence and are not intended to be
+reversible.  The key to be used for signing is chosen by default or
+can be set with the @option{--local-user} and @option{--default-key}
+options.
+
 
 @item --detach-sign
 @itemx -b
@@ -221,8 +226,8 @@ Store only (make a simple RFC1991 literal data packet).
 @item --decrypt
 @itemx -d
 @opindex decrypt
-Decrypt the file given on the command line (or @code{stdin} if no file
-is specified) and write it to stdout (or the file specified with
+Decrypt the file given on the command line (or STDIN if no file
+is specified) and write it to STDOUT (or the file specified with
 @option{--output}). If the decrypted file is signed, the signature is also
 verified. This command differs from the default operation, as it never
 writes to the filename which is included in the file and it rejects
@@ -232,19 +237,19 @@ files which don't begin with an encrypted message.
 @opindex verify
 Assume that the first argument is a signed file or a detached signature
 and verify it without generating any output. With no arguments, the
-signature packet is read from stdin. If only a sigfile is given, it may
+signature packet is read from STDIN. If only a sigfile is given, it may
 be a complete signature or a detached signature, in which case the
 signed stuff is expected in a file without the ".sig" or ".asc"
 extension.  With more than 1 argument, the first should be a detached
 signature and the remaining files are the signed stuff. To read the
-signed stuff from stdin, use @samp{-} as the second filename.  For
+signed stuff from STDIN, use @samp{-} as the second filename.  For
 security reasons a detached signature cannot read the signed material
-from stdin without denoting it in the above way.
+from STDIN without denoting it in the above way.
 
 @item --multifile
 @opindex multifile
 This modifies certain other commands to accept multiple files for
-processing on the command line or read from stdin with each filename on
+processing on the command line or read from STDIN with each filename on
 a separate line. This allows for many files to be processed at
 once. @option{--multifile} may currently be used along with
 @option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that
@@ -291,6 +296,10 @@ secret key is not usable (for example, if it was created via
 @item --list-sigs
 @opindex list-sigs
 Same as @option{--list-keys}, but the signatures are listed too.
+@ifclear gpgone
+This command has the same effect as 
+using @option{--list-keys} with @option{--with-sig-list}.
+@end ifclear
 
 For each signature listed, there are several flags in between the "sig"
 tag and keyid. These flags give additional information about each
@@ -307,15 +316,31 @@ command "tsign").
 
 @item --check-sigs
 @opindex check-sigs
-Same as @option{--list-sigs}, but the signatures are verified.
+Same as @option{--list-sigs}, but the signatures are verified.  Note
+that for performance reasons the revocation status of a signing key is
+not shown.
+@ifclear gpgone
+This command has the same effect as 
+using @option{--list-keys} with @option{--with-sig-check}.
+@end ifclear
 
 The status of the verification is indicated by a flag directly following
 the "sig" tag (and thus before the flags described above for
 @option{--list-sigs}).  A "!" indicates that the signature has been
 successfully verified, a "-" denotes a bad signature and a "%" is used
-if an error occured while checking the signature (e.g. a non supported
+if an error occurred while checking the signature (e.g. a non supported
 algorithm).
 
+@ifclear gpgone
+@item --locate-keys
+@opindex locate-keys
+Locate the keys given as arguments.  This command basically uses the
+same algorithm as used when locating keys for encryption or signing and
+may thus be used to see what keys @command{@gpgname} might use.  In
+particular external methods as defined by @option{--auto-key-locate} may
+be used to locate a key.  Only public keys are listed.
+@end ifclear
+
 
 @item --fingerprint
 @opindex fingerprint
@@ -369,7 +394,7 @@ removed first. In batch mode the key must be specified by fingerprint.
 @opindex export
 Either export all keys from all keyrings (default keyrings and those
 registered via option @option{--keyring}), or if at least one name is given,
-those of the given name. The new keyring is written to stdout or to the
+those of the given name. The new keyring is written to STDOUT or to the
 file given with option @option{--output}. Use together with
 @option{--armor} to mail those keys.
 
@@ -379,7 +404,7 @@ Similar to @option{--export} but sends the keys to a keyserver.
 Fingerprints may be used instead of key IDs. Option @option{--keyserver}
 must be used to give the name of this keyserver. Don't send your
 complete keyring to a keyserver --- select only those keys which are new
-or changed by you.
+or changed by you.  If no key IDs are given, @command{gpg} does nothing.
 
 @item --export-secret-keys
 @itemx --export-secret-subkeys
@@ -400,7 +425,7 @@ Import/merge keys. This adds the given keys to the
 keyring. The fast version is currently just a synonym.
 
 There are a few other options which control how this command works.
-Most notable here is the @option{--keyserver-options merge-only} option
+Most notable here is the @option{--import-options merge-only} option
 which does not insert new keys but does only the merging of new
 signatures, user-IDs and subkeys.
 
@@ -460,16 +485,34 @@ For use with cron jobs, this command can be used together with
 a check is needed. To force a run even in batch mode add the option
 @option{--yes}.
 
+@anchor{option --export-ownertrust}
 @item --export-ownertrust
 @opindex export-ownertrust
-Send the ownertrust values to stdout. This is useful for backup purposes
+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.
+corrupted trustdb.  Example:
+@c man:.RS
+@example
+  @gpgname{} --export-ownertrust > otrust.txt
+@end example
+@c man:.RE
+
 
 @item --import-ownertrust
 @opindex import-ownertrust
 Update the trustdb with the ownertrust values stored in @code{files} (or
-stdin if not given); existing values will be overwritten.
+STDIN if not given); existing values will be overwritten.  In case of a
+severely damaged trustdb and if you have a recent backup of the
+ownertrust values (e.g. in the file @file{otrust.txt}, you may re-create
+the trustdb using these commands:
+@c man:.RS
+@example
+  cd ~/.gnupg
+  rm trustdb.gpg
+  @gpgname{} --import-ownertrust < otrust.txt
+@end example
+@c man:.RE
+
 
 @item --rebuild-keydb-caches
 @opindex rebuild-keydb-caches
@@ -480,7 +523,7 @@ situations too.
 @item --print-md @code{algo}
 @itemx --print-mds
 @opindex print-md
-Print message digest of algorithm ALGO for all given files or stdin.
+Print message digest of algorithm ALGO for all given files or STDIN.
 With the second form (or a deprecated "*" as algo) digests for all
 available algorithms are printed.
 
@@ -729,13 +772,24 @@ preferred keyserver and signature notations (if any) are shown.
 Set the list of user ID preferences to @code{string} for all (or just
 the selected) user IDs. Calling setpref with no arguments sets the
 preference list to the default (either built-in or set via
-@option{--default-preference-list}), and calling setpref with "none" as
-the argument sets an empty preference list. Use @command{@gpgname
+@option{--default-preference-list}), and calling setpref with "none"
+as the argument sets an empty preference list. Use @command{@gpgname
 --version} to get a list of available algorithms. Note that while you
 can change the preferences on an attribute user ID (aka "photo ID"),
 GnuPG does not select keys via attribute user IDs so these preferences
 will not be used by GnuPG.
 
+When setting preferences, you should list the algorithms in the order
+which you'd like to see them used by someone else when encrypting a
+message to your key.  If you don't include 3DES, it will be
+automatically added at the end.  Note that there are many factors that
+go into choosing an algorithm (for example, your key may not be the
+only recipient), and so the remote OpenPGP application being used to
+send to you may or may not follow your exact chosen order for a given
+message.  It will, however, only choose an algorithm that is present
+on the preference list of every recipient key.  See also the
+INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below.
+
 @item keyserver
 @opindex keyedit:keyserver
 Set a preferred keyserver for the specified user ID(s). This allows
@@ -921,7 +975,12 @@ Try to be as quiet as possible.
 @opindex batch
 @opindex no-batch
 Use batch mode.  Never ask, do not allow interactive commands.
-@option{--no-batch} disables this option.
+@option{--no-batch} disables this option.  Note that even with a
+filename given on the command line, gpg might still need to read from
+STDIN (in particular if gpg figures that the input is a
+detached signature and no data file has been specified).  Thus if you
+do not want to feed data via STDIN, you should connect STDIN to
+@file{/dev/null}.
 
 @item --no-tty
 @opindex no-tty
@@ -1052,10 +1111,10 @@ validation. This option is only meaningful if pka-lookups is set.
 
 @item --enable-dsa2
 @itemx --disable-dsa2
-Enables new-style DSA keys which (unlike the old style) may be larger
-than 1024 bit and use hashes other than SHA-1 and RIPEMD/160. Note
-that very few programs currently support these keys and signatures
-from them.
+Enable hash truncation for all DSA keys even for old DSA Keys up to
+1024 bit.  This is also the default with @option{--openpgp}.  Note
+that older versions of GnuPG also required this flag to allow the
+generation of DSA larger than 1024 bit.
 
 @item --photo-viewer @code{string}
 This is the command line that should be run to view a photo ID. "%i"
@@ -1068,7 +1127,7 @@ and "%%" for an actual percent sign. If neither %i or %I are present,
 then the photo will be supplied to the viewer on standard input.
 
 The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
-stdin". Note that if your image viewer program is not secure, then
+STDIN". Note that if your image viewer program is not secure, then
 executing it from GnuPG does not make it secure.
 
 @item --exec-path @code{string}
@@ -1305,29 +1364,42 @@ exists.
 GnuPG can automatically locate and retrieve keys as needed using this
 option. This happens when encrypting to an email address (in the
 "user@@example.com" form), and there are no user@@example.com keys on
-the local keyring. This option takes any number of the following
-arguments, in the order they are to be tried:
+the local keyring.  This option takes any number of the following
+mechanisms, in the order they are to be tried:
 
 @table @asis
 
 @item cert
-locate a key using DNS CERT, as specified in 2538bis (currently in
-draft): http://www.josefsson.org/rfc2538bis/
+Locate a key using DNS CERT, as specified in rfc4398.
 
 @item pka
-locate a key using DNS PKA.
+Locate a key using DNS PKA.
 
 @item ldap
-locate a key using the PGP Universal method of checking
-"ldap://keys.(thedomain)".
+Using DNS Service Discovery, check the domain in question for any LDAP
+keyservers to use.  If this fails, attempt to locate the key using the
+PGP Universal method of checking @samp{ldap://keys.(thedomain)}.
 
 @item keyserver
-locate a key using whatever keyserver is defined using the
+Locate a key using whatever keyserver is defined using the
 @option{--keyserver} option.
 
-@item (keyserver URL)
-In addition, a keyserver URL as used in the @option{--keyserver} option may be
-used here to query that particular keyserver.
+@item keyserver-URL
+In addition, a keyserver URL as used in the @option{--keyserver} option
+may be used here to query that particular keyserver.
+
+@item local
+Locate the key using the local keyrings.  This mechanism allows to
+select the order a local key lookup is done.  Thus using
+@samp{--auto-key-locate local} is identical to
+@option{--no-auto-key-locate}.
+
+@item nodefault
+This flag disables the standard local key lookup, done before any of the
+mechanisms defined by the @option{--auto-key-locate} are tried.  The
+position of this mechanism in the list does not matter.  It is not
+required if @code{local} is also used.
+
 @end table
 
 @item --keyid-format @code{short|0xshort|long|0xlong}
@@ -1352,7 +1424,7 @@ from below, but apply only to this particular keyserver.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. The keyserver
-@code{hkp://subkeys.pgp.net} uses round robin DNS to give a different
+@code{hkp://keys.gnupg.net} uses round robin DNS to give a different
 keyserver each time you use it.
 
 @item --keyserver-options @code{name=value1 }
@@ -1437,6 +1509,12 @@ Set the proxy to use for HTTP and HKP keyservers.  This overrides the
 @item max-cert-size
 When retrieving a key via DNS CERT, only accept keys up to this size.
 Defaults to 16384 bytes.
+
+@item debug
+Turn on debug output in the keyserver helper program.  Note that the
+details of debug output depends on which keyserver helper program is
+being used, and in turn, on any libraries that the keyserver helper
+program uses internally (libcurl, openldap, etc).
 @end table
 
 @item --completes-needed @code{n}
@@ -1809,6 +1887,10 @@ source distribution.
 @opindex fixed-list-mode
 Do not merge primary user ID and primary key in @option{--with-colon}
 listing mode and print all timestamps as seconds since 1970-01-01.
+@ifclear gpgone
+Since GnuPG 2.0.10, this mode is always used and thus this option is
+obsolete; it does not harm to use it though.
+@end ifclear
 
 @item --with-fingerprint
 @opindex with-fingerprint
@@ -1886,7 +1968,7 @@ Set the list of personal digest preferences to @code{string}.  Use
 and use @code{none} to set no preference at all.  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
+algorithm in this list is also used when signing without encryption
 (e.g. @option{--clearsign} or @option{--sign}). The default value is
 SHA-1.
 
@@ -1896,7 +1978,7 @@ Use @command{@gpgname --version} to get a list of available
 algorithms, and use @code{none} to set no preference at all.  This
 allows the user to factor in their own preferred algorithms when
 algorithms are chosen via recipient key preferences.  The most highly
-ranked compression algorithm in this list is algo used when there are
+ranked compression algorithm in this list is also used when there are
 no recipient keys to consider (e.g. @option{--symmetric}).
 
 @item --s2k-cipher-algo @code{name}
@@ -1980,9 +2062,9 @@ a message that PGP 2.x will not be able to handle. Note that `PGP
 available, but the MIT release is a good common baseline.
 
 This option implies @option{--rfc1991 --disable-mdc
---no-force-v4-certs --no-sk-comment --escape-from-lines
---force-v3-sigs --cipher-algo IDEA --digest-algo MD5 --compress-algo
-ZIP}. It also disables @option{--textmode} when encrypting.
+--no-force-v4-certs --escape-from-lines --force-v3-sigs --cipher-algo
+IDEA --digest-algo MD5 --compress-algo ZIP}. It also disables
+@option{--textmode} when encrypting.
 
 @item --pgp6
 @opindex pgp6
@@ -1993,8 +2075,8 @@ compression algorithms none and ZIP. This also disables
 --throw-keyids, and making signatures with signing subkeys as PGP 6
 does not understand signatures made by signing subkeys.
 
-This option implies @option{--disable-mdc --no-sk-comment
---escape-from-lines --force-v3-sigs}.
+This option implies @option{--disable-mdc --escape-from-lines
+--force-v3-sigs}.
 
 @item --pgp7
 @opindex pgp7
@@ -2066,11 +2148,13 @@ Same as @option{--status-fd}, except the status data is written to file
 @code{file}.
 
 @item --logger-fd @code{n}
-Write log output to file descriptor @code{n} and not to stderr.
+Write log output to file descriptor @code{n} and not to STDERR.
 
-@item --logger-file @code{file}
+@item --log-file @code{file}
+@itemx --logger-file @code{file}
 Same as @option{--logger-fd}, except the logger data is written to file
-@code{file}.
+@code{file}.  Note that @option{--log-file} is only implemented for
+GnuPG-2.
 
 @item --attribute-fd @code{n}
 Write attribute subpackets to the file descriptor @code{n}. This is most
@@ -2152,10 +2236,10 @@ 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 @option{--output} option is given, and
-PGP to use the "secure viewer" with a Tempest-resistant font to
-display the message. This option overrides @option{--set-filename}.
+Set the `for your eyes only' flag in the message. This causes GnuPG to
+refuse to save the file unless the @option{--output} option is given,
+and PGP to use a "secure viewer" with a claimed Tempest-resistant font
+to display the message. This option overrides @option{--set-filename}.
 @option{--no-for-your-eyes-only} disables this option.
 
 @item --use-embedded-filename
@@ -2221,12 +2305,15 @@ will still get disabled.
 
 @item --throw-keyids
 @itemx --no-throw-keyids
-Do not put the recipient key IDs into encrypted messages. This helps
-to hide the receivers of the message and is a limited countermeasure
-against traffic analysis. On the receiving side, it may slow down the
-decryption process because all available secret keys must be tried.
-@option{--no-throw-keyids} disables this option. This option is essentially
-the same as using @option{--hidden-recipient} for all recipients.
+Do not put the recipient key IDs into encrypted messages. This helps to
+hide the receivers of the message and is a limited countermeasure
+against traffic analysis.@footnote{Using a little social engineering
+anyone who is able to decrypt the message can check whether one of the
+other recipients is the one he suspects.}  On the receiving side, it may
+slow down the decryption process because all available secret keys must
+be tried.  @option{--no-throw-keyids} disables this option. This option
+is essentially the same as using @option{--hidden-recipient} for all
+recipients.
 
 @item --not-dash-escaped
 This option changes the behavior of cleartext signatures
@@ -2253,7 +2340,7 @@ passphrase.  Defaults to 1 repetition.
 @item --passphrase-fd @code{n}
 Read the passphrase from file descriptor @code{n}. Only the first line
 will be read from file descriptor @code{n}. If you use 0 for @code{n},
-the passphrase will be read from stdin. This can only be used if only
+the passphrase will be read from STDIN. This can only be used if only
 one passphrase is supplied.
 @ifclear gpgone
 Note that this passphrase is only used if the option @option{--batch}
@@ -2415,11 +2502,15 @@ This is an obsolete option and is not used anywhere.
 
 @item --allow-multiple-messages
 @item --no-allow-multiple-messages
-Allow processing of multiple OpenPGP messages contained in a single
-file or stream.  Some programs that call GPG are not prepared to deal
-with multiple messages being processed together, so this option
-defaults to no.  Note that versions of GPG prior to 1.4.7 always
-allowed multiple messages.
+Allow processing of multiple OpenPGP messages contained in a single file
+or stream.  Some programs that call GPG are not prepared to deal with
+multiple messages being processed together, so this option defaults to
+no.  Note that versions of GPG prior to 1.4.7 always allowed multiple
+messages.  
+
+Warning: Do not use this option unless you need it as a temporary
+workaround!
+
 
 @item --enable-special-filenames
 This options enables a mode in which filenames of the form
@@ -2542,12 +2633,12 @@ current home directory (@pxref{option --homedir}).
 @table @file
 
 @item gpg.conf
-@cindex gpgsm.conf
+@cindex gpg.conf
 This is the standard configuration file read by @command{@gpgname} on
 startup.  It may contain any valid long option; the leading two dashes
 may not be entered and the option may not be abbreviated.  This default
-name may be changed on the command line (@pxref{option
-  --options}).
+name may be changed on the command line (@pxref{option --options}).
+You should backup this file.
 
 @end table
 
@@ -2567,31 +2658,32 @@ files; They all live in in the current home directory (@pxref{option
 
 @table @file
 @item ~/.gnupg/secring.gpg
-The secret keyring.
+The secret keyring.  You should backup this file.
 
 @item ~/.gnupg/secring.gpg.lock
-and the lock file
+The lock file for the secret keyring.
 
 @item ~/.gnupg/pubring.gpg
-The public keyring
+The public keyring.  You should backup this file.
 
 @item ~/.gnupg/pubring.gpg.lock
-and the lock file
+The lock file for the public keyring.
 
 @item ~/.gnupg/trustdb.gpg
-The trust database
+The trust database.  There is no need to backup this file; it is better
+to backup the ownertrust values (@pxref{option --export-ownertrust}).
 
 @item ~/.gnupg/trustdb.gpg.lock
-and the lock file
+The lock file for the trust database.
 
 @item ~/.gnupg/random_seed
-used to preserve the internal random pool
+A file used to preserve the state of the internal random pool.
 
 @item /usr[/local]/share/gnupg/options.skel
-Skeleton options file
+The skeleton options file.
 
 @item /usr[/local]/lib/gnupg/
-Default location for extensions
+Default location for extensions.
 
 @end table
 
@@ -2619,7 +2711,7 @@ value. The option @option{--gpg-agent-info} can be used to override it.
 
 @item PINENTRY_USER_DATA
 This value is passed via gpg-agent to pinentry.  It is useful to convey
-extra information to a custom pinentry
+extra information to a custom pinentry.
 
 @item COLUMNS
 @itemx LINES
@@ -2628,12 +2720,13 @@ Used to size some displays to the full size of the screen.
 
 @item LANGUAGE
 Apart from its use by GNU, it is used in the W32 version to override the
-language selection done through the Registry.  If used and set to a a
+language selection done through the Registry.  If used and set to a
 valid and available language name (@var{langid}), the file with the
 translation is loaded from
 @code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}.  Here @var{gpgdir} is the
-directory out of which the gpg binary has been laoded.  If it can't be
-loaded the Registry is tried as a fallback.
+directory out of which the gpg binary has been loaded.  If it can't be
+loaded the Registry is tried and as last resort the native Windows
+locale system is used.  
 
 @end table
 
@@ -2658,6 +2751,9 @@ make a clear text signature
 @item gpg -sb @code{file}
 make a detached signature
 
+@item gpg -u 0x12345678 -sb @code{file}
+make a detached signature with the key 0x12345678
+
 @item gpg --list-keys @code{user_ID}
 show keys
 
@@ -2706,7 +2802,7 @@ 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 give both filenames on the command line
-or use @samp{-} to specify stdin.
+or use @samp{-} to specify STDIN.
 
 @mansect interoperability
 @chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 0ee6614da..b6047f4ba 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -123,13 +123,14 @@ one signature was bad, and other error codes for fatal errors.
 @table @asis
 
 @item @gpgvname @code{pgpfile}
-@itemx @gpgvname @code{sigfile} 
-Verify the signature of the file. The second form
-is used for detached signatures, where @code{sigfile} is the detached
-signature (either ASCII-armored or binary) and are the signed
-data; if this is not given the name of the file holding the signed data is
-constructed by cutting off the extension (".asc", ".sig" or ".sign") from
-@code{sigfile}.
+@itemx @gpgvname @code{sigfile} [@code{datafile}]
+Verify the signature of the file. The second form is used for detached
+signatures, where @code{sigfile} is the detached signature (either
+ASCII-armored or binary) and @code{datafile} contains the signed data;
+if @code{datafile} is "-" the signed data is expected on
+@code{stdin}; if @code{datafile} is not given the name of the file
+holding the signed data is constructed by cutting off the extension
+(".asc", ".sig" or ".sign") from @code{sigfile}.
 
 @end table
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index dc52ab990..822f7b71b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,19 @@
+2009-08-13  Werner Koch  <wk@g10code.com>
+
+	* cardglue.h: Add new error code mappings.
+
+	From GnuPG-2:
+	* app-openpgp.c (change_keyattr_from_string): New.
+	(do_setattr): Support KEY-ATTR.
+	* ccid-driver.c (print_pr_data): Fix 64 bit compat problem.
+	* ccid-driver.c (parse_ccid_descriptor): Enable hack for SCR 3320.
+	* card-util.c (generate_card_keys): Remove special case for
+	GnuPG-2.  Ask for the keysize and change it.
+	(card_generate_subkey): Ask for the keysize and change it.
+	(get_info_for_key_operation): Read KEY-ATTR.
+	(show_keysize_warning, ask_card_keysize): New.
+	(do_change_keysize): New.
+
 2009-08-11  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Try and detect mis-coded Latin1
diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index d2b2bdd3f..2c10cd9bf 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -214,6 +214,11 @@ static gpg_error_t do_auth (app_t app, const char *keyidstr,
                             const void *indata, size_t indatalen,
                             unsigned char **outdata, size_t *outdatalen);
 static void parse_algorithm_attribute (app_t app, int keyno);
+static gpg_error_t change_keyattr_from_string
+                           (app_t app, 
+                            gpg_error_t (*pincb)(void*, const char *, char **),
+                            void *pincb_arg,
+                            const void *value, size_t valuelen);
 
 
 
@@ -1793,6 +1798,7 @@ do_setattr (app_t app, const char *name,
     { "CERT-3",       0x7F21, 3, 0, 1 },
     { "SM-KEY-ENC",   0x00D1, 3, 0, 1 },
     { "SM-KEY-MAC",   0x00D2, 3, 0, 1 },
+    { "KEY-ATTR",     0,      0, 3, 1 },
     { NULL, 0 }
   };
   int exmode;
@@ -1804,6 +1810,9 @@ do_setattr (app_t app, const char *name,
   if (table[idx].need_v2 && !app->app_local->extcap.is_v2)
     return gpg_error (GPG_ERR_NOT_SUPPORTED); /* Not yet supported.  */
 
+  if (table[idx].special == 3)
+    return change_keyattr_from_string (app, pincb, pincb_arg, value, valuelen);
+
   switch (table[idx].need_chv)
     {
     case 2:
@@ -2404,6 +2413,45 @@ change_keyattr (app_t app, int keyno, unsigned int nbits,
 }
 
 
+/* Helper to process an setattr command for name KEY-ATTR.  It expects
+   a string "--force <keyno> <algo> <nbits>" in (VALUE,VALUELEN).  */
+static gpg_error_t 
+change_keyattr_from_string (app_t app, 
+                            gpg_error_t (*pincb)(void*, const char *, char **),
+                            void *pincb_arg,
+                            const void *value, size_t valuelen)
+{
+  gpg_error_t err;
+  char *string;
+  int keyno, algo;
+  unsigned int nbits;
+
+  /* VALUE is expected to be a string but not guaranteed to be
+     terminated.  Thus copy it to an allocated buffer first. */
+  string = xtrymalloc (valuelen+1);
+  if (!string)
+    return gpg_error_from_syserror ();
+  memcpy (string, value, valuelen);
+  string[valuelen] = 0;
+
+  /* Because this function deletes the key we require the string
+     "--force" in the data to make clear that something serious might
+     happen.  */
+  if (sscanf (string, " --force %d %d %u", &keyno, &algo, &nbits) != 3)
+    err = gpg_error (GPG_ERR_INV_DATA);
+  else if (keyno < 1 || keyno > 3)
+    err = gpg_error (GPG_ERR_INV_ID);
+  else if (algo != 1)
+    err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Not RSA.  */
+  else if (nbits < 1024)
+    err = gpg_error (GPG_ERR_TOO_SHORT);
+  else
+    err = change_keyattr (app, keyno-1, nbits, pincb, pincb_arg);
+
+  xfree (string);
+  return err;
+}
+
 
 /* Handle the WRITEKEY command for OpenPGP.  This function expects a
    canonical encoded S-expression with the secret key in KEYDATA and
diff --git a/g10/card-util.c b/g10/card-util.c
index d03de0b46..61fd3112e 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -23,6 +23,10 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#ifdef HAVE_LIBREADLINE
+# define GNUPG_LIBREADLINE_H_INCLUDED
+# include <readline/readline.h>
+#endif /*HAVE_LIBREADLINE*/
 
 #if GNUPG_MAJOR_VERSION != 1
 # include "gpg.h"
@@ -34,12 +38,8 @@
 #include "options.h"
 #include "main.h"
 #include "keyserver-internal.h"
+
 #if GNUPG_MAJOR_VERSION == 1
-# ifdef HAVE_LIBREADLINE
-# define GNUPG_LIBREADLINE_H_INCLUDED
-# include <stdio.h>
-# include <readline/readline.h>
-# endif /*HAVE_LIBREADLINE*/
 # include "cardglue.h"
 #else /*GNUPG_MAJOR_VERSION!=1*/
 # include "call-agent.h"
@@ -1158,6 +1158,8 @@ get_info_for_key_operation (struct agent_card_info_s *info)
     rc = agent_scd_getattr ("DISP-NAME", info);
   if (!rc)
     rc = agent_scd_getattr ("EXTCAP", info);
+  if (!rc)
+    rc = agent_scd_getattr ("KEY-ATTR", info);
   if (rc)
     log_error (_("error getting current key info: %s\n"), gpg_strerror (rc));
   return rc;
@@ -1253,34 +1255,114 @@ replace_existing_key_p (struct agent_card_info_s *info, int keyno)
 }
 
 
+static void
+show_keysize_warning (void)
+{
+  static int shown;
+
+  if (shown)
+    return;
+  shown = 1;
+  tty_printf
+    (_("NOTE: There is no guarantee that the card "
+       "supports the requested size.\n"
+       "      If the key generation does not succeed, "
+       "please check the\n"
+       "      documentation of your card to see what "
+       "sizes are allowed.\n"));
+}
+
+
+/* Ask for the size of a card key.  NBITS is the current size
+   configured for the card.  KEYNO is the number of the key used to
+   select the prompt.  Returns 0 to use the default size (i.e. NBITS)
+   or the selected size.  */
+static unsigned int
+ask_card_keysize (int keyno, unsigned int nbits)
+{
+  unsigned int min_nbits = 1024;
+  unsigned int max_nbits = 3072; /* GnuPG limit due to Assuan.  */
+  char *prompt, *answer;
+  unsigned int req_nbits;
+
+  for (;;)
+    {
+      prompt = xasprintf 
+        (keyno == 0?
+         _("What keysize do you want for the Signature key? (%u) "):
+         keyno == 1?
+         _("What keysize do you want for the Encryption key? (%u) "):
+         _("What keysize do you want for the Authentication key? (%u) "),
+         nbits);
+      answer = cpr_get ("cardedit.genkeys.size", prompt);
+      cpr_kill_prompt ();
+      req_nbits = *answer? atoi (answer): nbits;
+      xfree (prompt);
+      xfree (answer);
+      
+      if (req_nbits != nbits && (req_nbits % 32) )
+        {
+          req_nbits = ((req_nbits + 31) / 32) * 32;
+          tty_printf (_("rounded up to %u bits\n"), req_nbits);
+        }
+  
+      if (req_nbits == nbits)
+        return 0;  /* Use default.  */
+      
+      if (req_nbits < min_nbits || req_nbits > max_nbits)
+        {
+          tty_printf (_("%s keysizes must be in the range %u-%u\n"),
+                      "RSA", min_nbits, max_nbits);
+        }
+      else
+        {
+          tty_printf (_("The card will now be re-configured "
+                        "to generate a key of %u bits\n"), req_nbits);
+          show_keysize_warning ();
+          return req_nbits;
+        }
+    }
+}
+
+
+/* Change the size of key KEYNO (0..2) to NBITS and show an error
+   message if that fails.  */
+static gpg_error_t
+do_change_keysize (int keyno, unsigned int nbits) 
+{
+  gpg_error_t err;
+  char args[100];
+  
+  snprintf (args, sizeof args, "--force %d 1 %u", keyno+1, nbits);
+  err = agent_scd_setattr ("KEY-ATTR", args, strlen (args), NULL);
+  if (err)
+    log_error (_("error changing size of key %d to %u bits: %s\n"), 
+               keyno+1, nbits, gpg_strerror (err));
+  return err;
+}
+ 
+
 static void
 generate_card_keys (void)
 {
   struct agent_card_info_s info;
   int forced_chv1;
   int want_backup;
+  int keyno;
 
   if (get_info_for_key_operation (&info))
     return;
 
   if (info.extcap.ki)
     {
-#if GNUPG_MAJOR_VERSION == 1
       char *answer;
 
-
       answer = cpr_get ("cardedit.genkeys.backup_enc",
                         _("Make off-card backup of encryption key? (Y/n) "));
 
-      want_backup=answer_is_yes_no_default(answer,1);
-      cpr_kill_prompt();
-      xfree(answer);
-#else
-      want_backup = cpr_get_answer_is_yes 
-          ( "cardedit.genkeys.backup_enc",
-                    _("Make off-card backup of encryption key? (Y/n) "));
-  /*FIXME: we need answer_is_yes_no_default()*/
-#endif
+      want_backup = answer_is_yes_no_default (answer, 1/*(default to Yes)*/);
+      cpr_kill_prompt ();
+      xfree (answer);
     }
   else
     want_backup = 0;
@@ -1290,16 +1372,19 @@ generate_card_keys (void)
        || (info.fpr3valid && !fpr_is_zero (info.fpr3)))
     {
       tty_printf ("\n");
-      log_info ("NOTE: keys are already stored on the card!\n");
+      log_info (_("NOTE: keys are already stored on the card!\n"));
       tty_printf ("\n");
-      if ( !cpr_get_answer_is_yes( "cardedit.genkeys.replace_keys",
-                                  _("Replace existing keys? (y/N) ")))
+      if ( !cpr_get_answer_is_yes ("cardedit.genkeys.replace_keys",
+                                   _("Replace existing keys? (y/N) ")))
         {
           agent_release_card_info (&info);
           return;
         }
     }
-  else if (!info.disp_name || !*info.disp_name)
+
+  /* If no displayed name has been set, we assume that this is a fresh
+     card and print a hint about the default PINs.  */
+  if (!info.disp_name || !*info.disp_name)
     {
       tty_printf ("\n");
       tty_printf (_("Please note that the factory settings of the PINs are\n"
@@ -1311,9 +1396,31 @@ generate_card_keys (void)
 
   if (check_pin_for_key_operation (&info, &forced_chv1))
     goto leave;
-  
-  generate_keypair (NULL, info.serialno,
-                    want_backup? opt.homedir:NULL);
+
+  /* If the cards features changeable key attributes, we ask for the
+     key size.  */
+  if (info.is_v2 && info.extcap.aac)
+    {
+      unsigned int nbits;
+
+      for (keyno = 0; keyno < DIM (info.key_attr); keyno++)
+        {
+          nbits = ask_card_keysize (keyno, info.key_attr[keyno].nbits);
+          if (nbits && do_change_keysize (keyno, nbits))
+            {
+              /* Error: Better read the default key size again.  */
+              agent_release_card_info (&info);
+              if (get_info_for_key_operation (&info))
+                goto leave;
+              /* Ask again for this key size. */
+              keyno--;
+            }
+        }
+      /* Note that INFO has not be synced.  However we will only use
+         the serialnumber and thus it won't harm.  */
+    }
+     
+  generate_keypair (NULL, info.serialno, want_backup? opt.homedir:NULL);
 
  leave:
   agent_release_card_info (&info);
@@ -1365,6 +1472,26 @@ card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock)
   if (check_pin_for_key_operation (&info, &forced_chv1))
     goto leave;
 
+  /* If the cards features changeable key attributes, we ask for the
+     key size.  */
+  if (info.is_v2 && info.extcap.aac)
+    {
+      unsigned int nbits;
+
+    ask_again:
+      nbits = ask_card_keysize (keyno-1, info.key_attr[keyno-1].nbits);
+      if (nbits && do_change_keysize (keyno-1, nbits))
+        {
+          /* Error: Better read the default key size again.  */
+          agent_release_card_info (&info);
+          if (get_info_for_key_operation (&info))
+            goto leave;
+          goto ask_again;
+        }
+      /* Note that INFO has not be synced.  However we will only use
+         the serialnumber and thus it won't harm.  */
+    }
+
   okay = generate_card_subkeypair (pub_keyblock, sec_keyblock,
                                    keyno, info.serialno);
 
@@ -1577,7 +1704,7 @@ static struct
   };
 
 
-#if GNUPG_MAJOR_VERSION == 1 && defined (HAVE_LIBREADLINE)
+#ifdef HAVE_LIBREADLINE
 
 /* These two functions are used by readline for command completion. */
 
@@ -1610,6 +1737,7 @@ command_generator(const char *text,int state)
 static char **
 card_edit_completion(const char *text, int start, int end)
 {
+  (void)end;
   /* If we are at the start of a line, we try and command-complete.
      If not, just do nothing for now. */
 
@@ -1620,7 +1748,7 @@ card_edit_completion(const char *text, int start, int end)
 
   return NULL;
 }
-#endif /* GNUPG_MAJOR_VERSION == 1 && HAVE_LIBREADLINE */
+#endif /*HAVE_LIBREADLINE*/
 
 /* Menu to edit all user changeable values on an OpenPGP card.  Only
    Key creation is not handled here. */
@@ -1688,15 +1816,11 @@ card_edit (strlist_t commands)
 
 	    if (!have_commands)
               {
-#if GNUPG_MAJOR_VERSION == 1
 		tty_enable_completion (card_edit_completion);
-#endif
 		answer = cpr_get_no_help("cardedit.prompt", _("Command> "));
 		cpr_kill_prompt();
-#if GNUPG_MAJOR_VERSION == 1
 		tty_disable_completion ();
-#endif
-	    }
+              }
 	    trim_spaces(answer);
 	}
       while ( *answer == '#' );
diff --git a/g10/cardglue.h b/g10/cardglue.h
index f55ae6e8b..b653f36dd 100644
--- a/g10/cardglue.h
+++ b/g10/cardglue.h
@@ -134,6 +134,11 @@ typedef struct ctrl_ctx_s *ctrl_t;
 #define GPG_ERR_ENODEV            G10ERR_GENERAL
 #define GPG_ERR_CANCELED          G10ERR_CANCELED
 
+#define GPG_ERR_INV_DATA          G10ERR_GENERAL
+#define GPG_ERR_PUBKEY_ALGO       G10ERR_PUBKEY_ALGO
+#define GPG_ERR_TOO_SHORT         G10ERR_INV_ARG
+
+
 typedef int gpg_error_t;
 typedef int gpg_err_code_t;
 
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index b71c43c29..844058e0b 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -413,7 +413,7 @@ print_pr_data (const unsigned char *data, size_t datalen, size_t off)
         {
           if (any)
             DEBUGOUT_LF ();
-          DEBUGOUT_1 ("  [%04d] ", off);
+          DEBUGOUT_1 ("  [%04lu] ", (unsigned long) off);
         }
       DEBUGOUT_CONT_1 (" %02X", data[off]);
       any = 1;
@@ -944,6 +944,11 @@ parse_ccid_descriptor (ccid_driver_t handle,
 	 0x5111 - SCR 331-DI 
 	 0x5115 - SCR 335 
 	 0xe003 - SPR 532 
+     The     
+         0x5117 - SCR 3320 USB ID-000 reader
+     seems to be very slow but enabling this workaround boosts the
+     performance to a a more or less acceptable level (tested by David). 
+         
   */
   if (handle->id_vendor == VENDOR_SCM
       && handle->max_ifsd > 48      
@@ -951,6 +956,7 @@ parse_ccid_descriptor (ccid_driver_t handle,
           ||(handle->id_product == 0x5111 && handle->bcd_device < 0x0620)
           ||(handle->id_product == 0x5115 && handle->bcd_device < 0x0514)
           ||(handle->id_product == 0xe003 && handle->bcd_device < 0x0504)
+          ||(handle->id_product == 0x5117 && handle->bcd_device < 0x0522)
           ))
     {
       DEBUGOUT ("enabling workaround for buggy SCM readers\n");
diff --git a/po/ChangeLog b/po/ChangeLog
index 4c694b0d0..af4957fe2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-14  Werner Koch  <wk@g10code.com>
+
+	* de.po: s/nicht-exportfähig/unwiderrufbar/.  Reported by Simon
+	Richter.
+
 2009-07-13  Werner Koch  <wk@g10code.com>
 
 	* nl.po: Applied a small fix by Jeroen Leeuwestein.  Fixes bug#1085.
diff --git a/po/be.po b/po/be.po
index e7f494894..8f58aec14 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -39,13 +39,12 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "запіс у stdout\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -77,9 +76,10 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -122,175 +122,218 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "паказаць ключы й адбіткі пальцаў"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "стварыць новую пару ключоў"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "стварыць новую пару ключоў"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+msgid "Reset Code not or not anymore available\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -373,170 +416,230 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr ""
+
+#: g10/card-util.c:1294
+#, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr ""
+
+#: g10/card-util.c:1295
+#, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr ""
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr ""
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -544,188 +647,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -734,13 +846,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -837,7 +949,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -1228,7 +1340,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr ""
 
@@ -1236,7 +1348,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr ""
 
@@ -1369,405 +1481,405 @@ msgstr ""
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
@@ -1811,17 +1923,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -1850,7 +1962,7 @@ msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для 
 
 #: g10/gpgv.c:102
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
@@ -2541,12 +2653,12 @@ msgstr ""
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -2595,7 +2707,7 @@ msgstr ""
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2603,12 +2715,12 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
@@ -2808,8 +2920,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -2818,20 +2930,20 @@ msgstr "збой падпісаньня: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -2848,7 +2960,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -3165,47 +3277,47 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3213,422 +3325,423 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3641,109 +3754,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr ""
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr ""
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr ""
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr ""
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr ""
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr ""
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr ""
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr ""
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3753,7 +3861,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3763,48 +3871,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3814,44 +3922,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3859,7 +3967,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3874,34 +3982,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -3909,7 +4017,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -3917,91 +4025,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4034,250 +4142,250 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -4432,63 +4540,63 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4526,60 +4634,65 @@ msgstr ""
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr ""
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr ""
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "сакрэтны ключ недаступны"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -4632,11 +4745,11 @@ msgstr "%s: тэчка створана\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -4723,7 +4836,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4732,58 +4845,58 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4803,219 +4916,219 @@ msgstr ""
 msgid "No trust value assigned to:\n"
 msgstr ""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr ""
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr ""
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr ""
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = quit [выйсьці]\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr ""
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr ""
 
@@ -5082,7 +5195,7 @@ msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -5104,11 +5217,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -5127,30 +5240,30 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5161,34 +5274,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr ""
 
@@ -5260,44 +5373,44 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5425,12 +5538,12 @@ msgstr "памылка чытаньня файла"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5474,83 +5587,83 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
 
 #: g10/textfilter.c:147
@@ -5598,129 +5711,137 @@ msgstr ""
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5978,48 +6099,48 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 #, fuzzy
 msgid "yes"
 msgstr "yes [так]"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no [не]"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr ""
 
@@ -6055,10 +6176,6 @@ msgstr ""
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "немагчыма адкрыць %s: %s\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "памылка стварэньня \"%s\": %s\n"
-
 #~ msgid "passphrase too long\n"
 #~ msgstr "пароль занадта доўгі\n"
 
diff --git a/po/ca.po b/po/ca.po
index 4dd208d97..289a88ca7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -59,13 +59,12 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -98,9 +97,10 @@ msgstr "no s'ha pogut llegir «%s»: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -154,176 +154,222 @@ msgstr ""
 "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n"
 "sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "l'enviament al servidor de claus ha fallat: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "error en crear «%s»: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "error: l'empremta digital és invàlida\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "«%s» ja està comprimida\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "genera un nou parell de claus"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "La generació de claus ha fallat: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "La generació de claus ha fallat: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "signatura %s, algorisme de resum %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "l'enviament al servidor de claus ha fallat: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "Introduïu el nom d'usuari: "
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+# Parts?  Peces?  ivb
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "parts de la clau secreta no estan disponbles\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Seleccioneu la raó de la revocació:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "error: l'empremta digital és invàlida\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "«%s» ja està comprimida\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera un nou parell de claus"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "genera un nou parell de claus"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "La generació de claus ha fallat: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "La generació de claus ha fallat: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -413,43 +459,48 @@ msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -457,134 +508,191 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arrodonida fins a %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "es descarta: la clau secreta ja és present\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -592,194 +700,203 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -788,13 +905,13 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -902,7 +1019,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@ -1319,7 +1436,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -1327,7 +1444,7 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compressió: "
 
@@ -1467,418 +1584,418 @@ msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "la URL de política de signatura donada no és vàlida\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s no és un joc de caràcters vàlid\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "la URL de política de signatura donada no és vàlida\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s no és un joc de caràcters vàlid\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
@@ -1926,18 +2043,18 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
@@ -1964,8 +2081,9 @@ msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
@@ -2782,12 +2900,12 @@ msgstr "error en crear l'anell «%s»: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
@@ -2836,7 +2954,7 @@ msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2848,12 +2966,12 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
@@ -3093,8 +3211,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3103,20 +3221,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3133,7 +3251,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -3490,121 +3608,121 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3612,19 +3730,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3634,7 +3752,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3643,78 +3761,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3723,273 +3841,274 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -4002,109 +4121,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (només signar)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (només xifrar)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (només xifrar)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (només signar)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "arrodonida fins a %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4120,7 +4234,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4136,42 +4250,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4179,12 +4293,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4201,44 +4315,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4249,7 +4363,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4266,23 +4380,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4290,12 +4404,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4307,7 +4421,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4319,53 +4433,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4374,13 +4488,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4389,7 +4503,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4397,26 +4511,26 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4449,258 +4563,258 @@ msgstr "Notació de signatura: "
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@ -4861,63 +4975,63 @@ msgstr "Signatura correcta de \""
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -4957,36 +5071,41 @@ msgstr "l'algoritme de xifratge no és implementat"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "AVÍS: %s és una opció desaconsellada.\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -4994,29 +5113,29 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "No comprimit"
 
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -5071,12 +5190,12 @@ msgstr "%s: s'ha creat el directori\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@ -5175,7 +5294,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5190,59 +5309,59 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
@@ -5265,90 +5384,90 @@ msgstr ""
 "No hi ha cap valor de confiança assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No ho sé\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO confie\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Hi confie absolutament\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al menú principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omet aquesta clau\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " x = ix\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5360,112 +5479,112 @@ msgstr ""
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5473,33 +5592,33 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
@@ -5570,7 +5689,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
@@ -5593,11 +5712,11 @@ msgstr "(Aquesta és una clau de revocació sensible)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
@@ -5616,29 +5735,29 @@ msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5657,34 +5776,34 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
@@ -5764,18 +5883,18 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5784,7 +5903,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5792,25 +5911,25 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5958,12 +6077,12 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6010,86 +6129,85 @@ msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"la base de dades de confiança està corrompuda; per favor, executeu «gpg --fix-"
-"trustdb».\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: s'ha creat la base de dades de confiança\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6138,137 +6256,145 @@ msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -6549,48 +6675,48 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "sí|si"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "ix"
 
 # «xX»?  ivb
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "xX"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6614,6 +6740,15 @@ msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
+#~ "fix-trustdb».\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
diff --git a/po/cs.po b/po/cs.po
index ea0561979..d5c9bcd1e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -39,13 +39,12 @@ msgstr "nelze zam
 msgid "waiting for lock on `%s'...\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -77,9 +76,10 @@ msgstr "nemohu 
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -132,174 +132,220 @@ msgstr ""
 "Nedostatek n�hodn�ch bajt�. Pros�m, pracujte s opera�n�m syst�mem, abyste\n"
 "mu umo�nili z�skat v�ce entropie (je pot�eba %d bajt�).\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "Do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|PIN administr�tora"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Pros�m vyberte d�vod revokace:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "generov�n� nov�ho kl��e\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -384,163 +430,225 @@ msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "chyba p�i vytv��en� `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "zaokrouhleno na %u bit�\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "tajn� kl�� je na kart� ulo�en\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -551,138 +659,147 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "tajn� kl�� nen� dostupn�"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -691,38 +808,38 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te nov� PIN administr�tora: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Vlo�te nov� PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Opakujte tento PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -731,13 +848,13 @@ msgstr "nelze otev
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -838,7 +955,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
@@ -1236,7 +1353,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "�ifra: "
 
@@ -1244,7 +1361,7 @@ msgstr "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Komprese: "
 
@@ -1400,410 +1517,410 @@ msgstr "V souboru tajn
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "`%s' nen� platn� doba expirace podpisu\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "`%s' nen� platn� doba expirace podpisu\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
@@ -1848,17 +1965,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -1884,8 +2001,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
@@ -2687,12 +2805,12 @@ msgstr "chyba p
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zdroj bloku kl��e `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
@@ -2741,7 +2859,7 @@ msgstr "objeven 1 identifik
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2753,12 +2871,12 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
@@ -2978,8 +3096,8 @@ msgstr "Velmi pe
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -2990,19 +3108,19 @@ msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3019,7 +3137,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -3332,45 +3450,45 @@ msgstr "Opravdu aktualizovat p
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3378,71 +3496,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3450,17 +3568,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3468,7 +3586,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3477,74 +3595,74 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3553,252 +3671,253 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autentizace"
 
@@ -3811,109 +3930,104 @@ msgstr "Autentizace"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "zaokrouhleno na %u bit�\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3929,7 +4043,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3945,38 +4059,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3984,11 +4098,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4004,44 +4118,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4052,7 +4166,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4067,25 +4181,25 @@ msgstr "Do pole jm
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4093,12 +4207,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4110,7 +4224,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4123,50 +4237,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4174,12 +4288,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4187,7 +4301,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4195,25 +4309,25 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
@@ -4246,246 +4360,246 @@ msgstr "Podepisovac
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
@@ -4646,62 +4760,62 @@ msgstr "Dobr
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -4740,59 +4854,64 @@ msgstr "VAROV
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -4844,11 +4963,11 @@ msgstr "adres
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -4934,7 +5053,7 @@ msgstr "         (podkl
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4948,58 +5067,58 @@ msgstr ""
 "kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
 "Vhodn� velikost obr�zku je asi 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t? (a/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
@@ -5019,44 +5138,44 @@ msgstr "iImMuUsS"
 msgid "No trust value assigned to:\n"
 msgstr "Nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Nakolik d�v��ujete tvrzen�, �e tento kl�� pat�� uveden�mu u�ivateli?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nev�m nebo ne�eknu\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5065,37 +5184,37 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? (a/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nic nenazna�uje tomu, �e tento kl�� pat�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Je zde ��ste�n� d�v�ra, �e tento kl�� pat�� uveden�mu uv�ivateli\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento kl�� pravd�podobn� n�le�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5106,108 +5225,108 @@ msgstr ""
 "n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5215,33 +5334,33 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
@@ -5310,7 +5429,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
@@ -5332,11 +5451,11 @@ msgstr "(Toto je citliv
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
@@ -5355,28 +5474,28 @@ msgstr "pro \"%s\" nebyl nalezen 
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5395,33 +5514,33 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
@@ -5497,17 +5616,17 @@ msgstr "VAROV
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5515,7 +5634,7 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5523,24 +5642,24 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
@@ -5683,12 +5802,12 @@ msgstr "chyba p
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
@@ -5732,84 +5851,85 @@ msgstr "%s: vytvo
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5856,122 +5976,130 @@ msgstr "z
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 "14 fixn� d�lka na kterou se p�ekl�d� see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5979,7 +6107,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
@@ -6239,47 +6367,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "ukon�it"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okey|okey"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "zru�it|zru�it"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "zZ"
 
@@ -6299,6 +6427,16 @@ msgstr "prov
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN administr�tora"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
diff --git a/po/da.po b/po/da.po
index 5392dbd61..cac41e1d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -40,13 +40,12 @@ msgstr "kan ikke 
 msgid "waiting for lock on `%s'...\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -78,9 +77,10 @@ msgstr "kan ikke 
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -132,177 +132,222 @@ msgstr ""
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "Indtast bruger-id: "
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "rev- forkert n�gletilbagekald\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "gener�r et nyt n�glepar"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -387,176 +432,237 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rundet op til %u bit\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
+
+#: g10/card-util.c:1378
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -564,195 +670,204 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -761,13 +876,13 @@ msgstr "kan ikke 
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -864,7 +979,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -1258,7 +1373,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr ""
 
@@ -1266,7 +1381,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
@@ -1402,419 +1517,419 @@ msgstr ""
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "den givne politik-URL er ugyldig\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s er ikke et gyldigt tegns�t\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "den givne politik-URL er ugyldig\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s er ikke et gyldigt tegns�t\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
@@ -1862,17 +1977,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
@@ -1902,7 +2017,7 @@ msgstr "Brug: gpg [flag] [filer] (-h for hj
 
 #: g10/gpgv.c:102
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
@@ -2600,12 +2715,12 @@ msgstr "fejl ved skrivning af n
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
@@ -2654,7 +2769,7 @@ msgstr ""
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2662,12 +2777,12 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
@@ -2873,8 +2988,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -2883,21 +2998,21 @@ msgstr "signering fejlede: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -2912,7 +3027,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -3253,47 +3368,47 @@ msgstr "Gener
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3301,438 +3416,439 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3745,109 +3861,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA og ElGamal (standard)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) ElGamal (krypt�r kun)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (krypt�r kun)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1502
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA n�glepar vil have 1024 bit.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "rundet op til %u bit\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3857,7 +3968,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3867,52 +3978,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3922,44 +4033,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3970,7 +4081,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3985,24 +4096,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4010,12 +4121,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4023,7 +4134,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4031,92 +4142,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4151,256 +4262,256 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -4557,64 +4668,64 @@ msgstr "God signatur fra \""
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4653,61 +4764,66 @@ msgstr "uimplementeret cifferalgoritme"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "ADVARSEL: '%s' er en tom fil\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "RSA n�gle kan ikke bruges i denne version\n"
+
+#: g10/misc.c:748
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -4760,11 +4876,11 @@ msgstr "%s: mappe oprettet\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -4849,7 +4965,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4858,63 +4974,63 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 # virker j automatisk istedetfor y?
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4938,233 +5054,233 @@ msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Denne n�gle tilh�rer os\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -5232,7 +5348,7 @@ msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -5255,11 +5371,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -5279,31 +5395,31 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5314,34 +5430,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
@@ -5416,44 +5532,44 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
@@ -5582,12 +5698,12 @@ msgstr "panser: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5631,83 +5747,83 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
 
 #: g10/textfilter.c:147
@@ -5755,130 +5871,138 @@ msgstr ""
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6139,47 +6263,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6201,6 +6325,10 @@ msgstr "operation er ikke mulig uden beskyttet hukommelse indl
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA n�glepar vil have 1024 bit.\n"
+
 #, fuzzy
 #~ msgid "a user notation name must contain the '@' character\n"
 #~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
diff --git a/po/de.po b/po/de.po
index 026639f83..f73729f6b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.8\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2009-06-02 15:23+0200\n"
-"PO-Revision-Date: 2009-06-02 15:27+0200\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
+"PO-Revision-Date: 2009-07-14 18:04+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,13 +41,12 @@ msgstr "'%s' kann nicht gesperrt werden: %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "es wird auf die Sperre `%s' gewartet...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3613 g10/import.c:193 g10/keygen.c:2499
-#: g10/keyring.c:1538 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:604
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -80,9 +79,10 @@ msgstr "'%s' ist unlesbar: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2980
-#: g10/keygen.c:3010 g10/keyring.c:1204 g10/keyring.c:1514 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -137,173 +137,219 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN-Callback meldete Fehler: %s\n"
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "Karte ist dauerhaft gesperrt!\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Admin-PIN"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Neue Admin-PIN"
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "|N|Neue PIN"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "Fehler beim Lesen der Anwendungsdaten\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "Schlüssel existiert bereits\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "Existierender Schlüssel wird ersetzt werden\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "neue Schlüssel werden erzeugt\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "Erzeugungsdatum fehlt\n"
-
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
-
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "Schlüsselerzeugung fehlgeschlagen\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN-Callback meldete Fehler: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "Karte ist dauerhaft gesperrt!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Neue Admin-PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|Neue PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "Fehler beim Lesen der Anwendungsdaten\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "Schlüssel existiert bereits\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "Existierender Schlüssel wird ersetzt werden\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "neue Schlüssel werden erzeugt\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "neue Schlüssel werden erzeugt\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "Erzeugungsdatum fehlt\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "Schlüsselerzeugung fehlgeschlagen\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -387,165 +433,227 @@ msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
 " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2683 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1401
-#: g10/keygen.c:1468
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "Fehler beim Erstellen von `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "aufgerundet auf %u Bit\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -556,139 +664,148 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1405 g10/keygen.c:1433 g10/keygen.c:1507 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2242
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "Kartenleser ist nicht vorhanden\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Legen Sie die Karte ein und drücken Sie 'Eingabe'; drücken Sie 'c' um "
 "abzubrechen: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "Auswahl der OpenPGP-Card-Anwendung fehlgeschlagen: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -698,36 +815,36 @@ msgstr ""
 "Seriennummer ein:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Drücken Sie 'Eingabe' wenn fertig; oder drücken Sie 'c' um abzubrechen: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die neue Admin-PIN ein: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Geben Sie die neue PIN ein: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Geben Sie die Admin-PIN ein: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Geben Sie die PIN ein: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die PIN nochmal ein: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3978 g10/keyring.c:375
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
 #: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
@@ -737,13 +854,13 @@ msgstr "'%s' kann nicht geöffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1727
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1402,439 +1519,439 @@ msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2291 g10/gpg.c:2960 g10/gpg.c:2979
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2304
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/gpg.c:2493 g10/gpg.c:2505
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2606 g10/gpg.c:2795 g10/keyedit.c:4078
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2618
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2631
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2638
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2641
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2648
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2651
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2661
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeige anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der "
 "Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2864
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2949
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2953
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2962
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2972
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
 
-#: g10/gpg.c:2987
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:2994
 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/gpg.c:3007
+#: g10/gpg.c:3000
 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/gpg.c:3013
+#: g10/gpg.c:3006
 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/gpg.c:3026
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3093 g10/gpg.c:3117
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3099 g10/gpg.c:3123
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3105
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3126
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3128
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3130
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3137
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3135
 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/gpg.c:3148
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3165
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3198
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3365
 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/gpg.c:3382
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3450
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3499
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3532
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3536
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/gpg.c:3670
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3672
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3674
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3685
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3695
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3956
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3968
+#: g10/gpg.c:3960
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4272
+#: g10/gpg.c:4264
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4274
+#: g10/gpg.c:4266
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4307
+#: g10/gpg.c:4299
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -1858,7 +1975,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2435 g10/keyedit.c:3721
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -3004,7 +3121,7 @@ msgstr "Die Unterschrift wird als nicht-exportfähig markiert werden.\n"
 
 #: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
-msgstr "Die Unterschrift wird als nicht-exportfähig markiert werden.\n"
+msgstr "Die Unterschrift wird als unwiderrufbar markiert werden.\n"
 
 #: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
@@ -3022,8 +3139,8 @@ msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3034,19 +3151,19 @@ msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
 "keine Passphrase ist zu ändern.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3319
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3307 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3322
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3326
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
@@ -3063,7 +3180,7 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1931
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -3446,7 +3563,7 @@ msgid "(sensitive)"
 msgstr "(empfindlich)"
 
 #: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
@@ -3463,7 +3580,7 @@ msgstr "verfallen: %s"
 
 #: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
-#: g10/keylist.c:911 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
@@ -3499,13 +3616,13 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:527
-#: g10/mainproc.c:1816 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:531
-#: g10/mainproc.c:1818 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "verfallen"
 
@@ -3566,7 +3683,7 @@ msgstr "%d Beglaubigungen entfernt.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "ungültig"
 
@@ -3666,199 +3783,200 @@ msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Unterschreibens nicht mächtig und braucht deshalb "
 "keine Rücksignatur\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, 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:4060
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "Voreinstellung `%s' ist doppelt\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "zu viele Verschlüsselungeinstellungen\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:275
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:400
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1110 g10/keygen.c:1115 g10/keygen.c:1232
-#: g10/keygen.c:2877
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1032 g10/keygen.c:1121 g10/keygen.c:1237 g10/keygen.c:2883
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1330
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Unterschr."
 
-#: g10/keygen.c:1333
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1336
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Authentisierung"
 
@@ -3871,109 +3989,104 @@ msgstr "Authentisierung"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1356
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "UuVvAaQq"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Unterschreibfähigkeit\n"
 
-#: g10/keygen.c:1391
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsfähigkeit\n"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
 
-#: g10/keygen.c:1397
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1490
 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:1455
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA und Elgamal (voreingestellt)\n"
 
-#: g10/keygen.c:1456
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA und Elgamal (voreingestellt)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur unterschreiben/beglaubigen)\n"
 
-#: g10/keygen.c:1458
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
-
-#: g10/keygen.c:1460
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
-
-#: g10/keygen.c:1461
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1465
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1534
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
-
-#: g10/keygen.c:1544
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/keygen.c:1565
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
-
-#: g10/keygen.c:1571
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:1576 g10/keygen.c:1581
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "aufgerundet auf %u Bit\n"
-
-#: g10/keygen.c:1648
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3989,7 +4102,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:1659
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4005,38 +4118,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1685
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1703 g10/keygen.c:1728
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1716
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1717
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1721
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4044,11 +4157,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4064,44 +4177,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1770
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1772
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1774
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:1788
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1831
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4112,7 +4225,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4127,23 +4240,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1852
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1862
+#: g10/keygen.c:1935
 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:1863
+#: g10/keygen.c:1936
 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:1882
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1922
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4151,12 +4264,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:1932 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:2011
 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"
@@ -4169,7 +4282,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1960
+#: g10/keygen.c:2033
 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"
@@ -4180,50 +4293,50 @@ 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:2823
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3023 g10/keygen.c:3172
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3025 g10/keygen.c:3175
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3178
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3161
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3185
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3192
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3215
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3226
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4232,12 +4345,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3238 g10/keygen.c:3367 g10/keygen.c:3482
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3290 g10/keygen.c:3417 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4245,7 +4358,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3292 g10/keygen.c:3419 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4253,25 +4366,25 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3301 g10/keygen.c:3430
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3340 g10/keygen.c:3463
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3628
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
 
-#: g10/keygen.c:3675
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3701
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -4358,199 +4471,199 @@ msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 msgid "caching keyring `%s'\n"
 msgstr "Puffern des Schlüsselbundes `%s'\n"
 
-#: g10/keyring.c:1435
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1447
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1518
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "verwende temporäre Dateien, um Daten an die Schlüsselserverhilfsprogramme zu "
 "geben"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "Temporäre Dateien nach Nutzung nicht löschen"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "Schlüssel für die Unterschriftenprüfung automatisch holen"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 "Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Schlüsselserver-Option `%s' wird auf dieser Plattform nicht "
 "verwendet\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "abgeschaltet"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1434
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1153
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
-#: g10/keyserver.c:1157
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1181
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche Namen auf %s-Server %s\n"
 
-#: g10/keyserver.c:1184
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "suche Namen auf %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "sende Schlüssel %s auf den %s-Server %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf %s-Server %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "Kein Schlüsselserver-Vorgang\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
 "GnuPG-Version (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "Schlüsselserver sendete VERSION nicht\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2035
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "Externe Schlüsselserveraufrufe werden in diesem \"Build\" nicht unterstützt\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserver-Zeitüberschreitung\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "interner Fehler Schlüsselserver\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "ein Schlüssel wird per %s aktualisiert\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
@@ -4736,7 +4849,7 @@ msgstr "Binäre"
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1917 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -4804,60 +4917,65 @@ msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:715
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:721
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
-#: g10/misc.c:766
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:893
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1068
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1093
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -5054,23 +5172,23 @@ msgstr "Es ist kein Bildbetrachter gesetzt\n"
 msgid "unable to display photo ID!\n"
 msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
@@ -5136,7 +5254,7 @@ msgid ""
 "\n"
 msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
 
-#: g10/pkclist.c:301 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
@@ -5396,7 +5514,7 @@ msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
@@ -5419,11 +5537,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
@@ -5442,29 +5560,29 @@ msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugehöriger öffentlicher Schlüssel: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "Öffentlicher Schlüssel paßt nicht zum geheimen Schlüssel!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
 # translated by wk
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5484,34 +5602,34 @@ msgstr ""
 "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
 "machen.\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund für den Widerruf:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund für Widerruf: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Ist das OK? (j/N) "
 
@@ -5558,8 +5676,8 @@ msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels für "
-"sym. Verschlüsselung nicht vermieden werden!\n"
+"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels "
+"für sym. Verschlüsselung nicht vermieden werden!\n"
 
 #: g10/seskey.c:218
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -5622,21 +5740,21 @@ msgstr ""
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
 
-#: g10/sig-check.c:323
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schlüssel %s, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:581
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:607
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5906,11 +6024,10 @@ msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1503
-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/tdbio.c:1502
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: trust-db erzeugt\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5959,124 +6076,132 @@ 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:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
 "Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "verwende Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[verfall.]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[  unbek.]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[  undef.]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ vollst.]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[ uneing.]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "niemals"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2447
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2190
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2255
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2269
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2292
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2378
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6084,7 +6209,7 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  unterschrieben: %3d  Vertrauen: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2453
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6408,6 +6533,17 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
+#~ "\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin-PIN"
+
 #~ msgid "failed to acquire the pinentry lock: %s\n"
 #~ msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
@@ -6473,9 +6609,6 @@ msgstr ""
 #~ msgid "shadowing the key failed: %s\n"
 #~ msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
 
-#~ msgid "error writing key: %s\n"
-#~ msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
-
 #~ msgid "Please enter the passphrase for the ssh key%0A  %c"
 #~ msgstr "Bitte geben Sie die Passphrase für den SSH-Schlüssel %0A  %c ein"
 
@@ -6501,9 +6634,6 @@ msgstr ""
 #~ msgid "Repeat this PIN"
 #~ msgstr "PIN bitte wiederholen"
 
-#~ msgid "Please enter the PIN%s%s%s to unlock the card"
-#~ msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
-
 #~ msgid "error creating temporary file: %s\n"
 #~ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
 
@@ -6676,9 +6806,6 @@ msgstr ""
 #~ msgid "error getting nonce for the socket\n"
 #~ msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#~ msgid "error binding socket to `%s': %s\n"
-#~ msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
-
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
@@ -7137,10 +7264,6 @@ msgstr ""
 #~ "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs "
 #~ "erzeugt: %lu]"
 
-#~ msgid "fingerprint on card does not match requested one\n"
-#~ msgstr ""
-#~ "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
-
 #~ msgid "run in multi server mode (foreground)"
 #~ msgstr "Im Multiserver Modus ausführen"
 
@@ -8027,9 +8150,6 @@ msgstr ""
 #~ msgid "No argument allowed"
 #~ msgstr "Argumente sind nicht erlaubt"
 
-#~ msgid "error allocating enough memory: %s\n"
-#~ msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
-
 #~ msgid ""
 #~ "@\n"
 #~ "Commands:\n"
diff --git a/po/el.po b/po/el.po
index 442fbed60..1f9b8cc18 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -38,13 +38,12 @@ msgstr "
 msgid "waiting for lock on `%s'...\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -78,9 +77,10 @@ msgstr "
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -133,176 +133,220 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "keyserver �������� �������: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "������ ��� ���������� ��� ������ ������: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' ��� �����������\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "���������� ���� ���� ������� ��������"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�������� ������������� ��� TrustDB: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "�������� block �������� �������: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "� ���������� �������� �������: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s ��������, ���������� ��������� %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "keyserver �������� �������: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' ��� �����������\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "���������� ���� ���� ������� ��������"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "���������� ���� ���� ������� ��������"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -389,176 +433,238 @@ msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "����������������� ��� �� %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "������������: ������� ������ ��� �����\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -566,192 +672,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "�������� �������� ��� ����������� `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -760,13 +875,13 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -876,7 +991,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
@@ -1278,7 +1393,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "���������������: "
 
@@ -1286,7 +1401,7 @@ msgstr "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "��������: "
 
@@ -1426,421 +1541,421 @@ msgstr "
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "�� %s ��� ����� ������ ��� ����������\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "�� %s ��� ����� ������ ��� ����������\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
@@ -1887,17 +2002,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -1923,8 +2038,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "�������: gpg [��������] [������]\n"
@@ -2731,12 +2847,12 @@ msgstr "
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
@@ -2785,7 +2901,7 @@ msgstr "1 user ID 
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2798,12 +2914,12 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
@@ -3045,8 +3161,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3055,20 +3171,20 @@ msgstr "
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3085,7 +3201,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -3429,117 +3545,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3547,19 +3663,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3567,7 +3683,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3576,75 +3692,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3654,38 +3770,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3693,235 +3809,236 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3934,109 +4051,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (��� ������������� ����)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (��� ������������� ����)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (��� ������������� ����)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (��� ������������� ����)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "����������������� ��� �� %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4052,7 +4164,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4068,40 +4180,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4109,12 +4221,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4131,44 +4243,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4179,7 +4291,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4194,23 +4306,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4218,12 +4330,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4235,7 +4347,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4247,50 +4359,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4301,12 +4413,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4314,7 +4426,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4322,28 +4434,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -4376,255 +4488,255 @@ msgstr "
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
@@ -4780,63 +4892,63 @@ msgstr "
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -4877,62 +4989,67 @@ msgstr "
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = ���������� ������������ �����������\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = ���������� ������������ �����������\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "����������"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -4986,11 +5103,11 @@ msgstr "%s: 
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -5079,7 +5196,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5093,59 +5210,59 @@ msgstr ""
 "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
 "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ��� ����� JPEG ������\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "����� ���� � ���������� ����� (y/N/q); "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
@@ -5168,89 +5285,89 @@ msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = ��� ����\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d =  ��� ��� �����������\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = ���� ��� ������ �����\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "���� �� ������ ������ �� ����\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5262,115 +5379,115 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
 "���������)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5378,34 +5495,34 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
@@ -5472,7 +5589,7 @@ msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
@@ -5495,11 +5612,11 @@ msgstr "(
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
@@ -5518,29 +5635,29 @@ msgstr "
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5559,33 +5676,33 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
@@ -5666,19 +5783,19 @@ msgstr ""
 "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
 "�����������\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5686,7 +5803,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5694,22 +5811,22 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
@@ -5856,12 +5973,12 @@ msgstr "
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
@@ -5905,84 +6022,85 @@ msgstr "%s: 
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: ������������� � trustdb\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6031,131 +6149,139 @@ msgstr "
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6417,47 +6543,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "���|���"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "���|���"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "�����������"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6478,6 +6604,14 @@ msgstr "
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
diff --git a/po/eo.po b/po/eo.po
index f4a747b5f..6e9943e9c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -38,13 +38,12 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -77,9 +76,10 @@ msgstr "ne povas legi '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -130,176 +130,221 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Kreado de �losiloj malsukcesis: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "eraro dum legado de �losilbloko: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: eraro dum legado de libera registro: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "'%s' jam densigita\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "krei novan �losilparon"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Kreado de �losiloj malsukcesis: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s-subskribo de: %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "Donu la uzantidentigilon: "
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Kialo por revoko: "
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "eraro dum legado de �losilbloko: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: eraro dum legado de libera registro: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "'%s' jam densigita\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "krei novan �losilparon"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "krei novan �losilparon"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -386,176 +431,238 @@ msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "eraro dum kreado de '%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rondigita �is %u bitoj\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "ignorita: sekreta �losilo jam �eestas\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,195 +670,204 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -760,13 +876,13 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -865,7 +981,7 @@ msgstr "NOTO: 
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
@@ -1260,7 +1376,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr ""
 
@@ -1268,7 +1384,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
@@ -1406,418 +1522,418 @@ msgstr "Mankas responda subskribo en sekreta 
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s ne estas valida signaro\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s ne estas valida signaro\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
@@ -1863,17 +1979,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -1903,7 +2019,7 @@ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
 #: g10/gpgv.c:102
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
@@ -2686,12 +2802,12 @@ msgstr "eraro dum kreado de 
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
@@ -2740,7 +2856,7 @@ msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2753,12 +2869,12 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
@@ -3013,8 +3129,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3023,20 +3139,20 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3053,7 +3169,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -3397,141 +3513,141 @@ msgstr "
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3540,75 +3656,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3618,269 +3734,270 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3893,109 +4010,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (nur �ifri)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (nur �ifri)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (nur �ifri)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nur �ifri)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "rondigita �is %u bitoj\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4011,7 +4123,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4027,40 +4139,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4068,12 +4180,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4089,44 +4201,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4137,7 +4249,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4152,23 +4264,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4176,12 +4288,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4193,7 +4305,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4205,50 +4317,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4257,12 +4369,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4270,7 +4382,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4278,26 +4390,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -4332,258 +4444,258 @@ msgstr "Subskribo-notacio: "
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -4740,64 +4852,64 @@ msgstr "Bona subskribo de \""
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -4836,61 +4948,66 @@ msgstr "nerealigita 
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#: g10/misc.c:748
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -4943,11 +5060,11 @@ msgstr "%s: dosierujo kreita\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -5035,7 +5152,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5044,61 +5161,61 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -5123,89 +5240,89 @@ msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5217,111 +5334,111 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5329,33 +5446,33 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -5423,7 +5540,7 @@ msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -5446,11 +5563,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
@@ -5470,31 +5587,31 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5505,37 +5622,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
@@ -5610,17 +5727,17 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5628,7 +5745,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5636,22 +5753,22 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
@@ -5793,12 +5910,12 @@ msgstr "kiraso: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -5842,84 +5959,85 @@ msgstr "%s: nevalida fido-datenaro kreita\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: fido-datenaro kreita\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5966,130 +6084,138 @@ msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6351,48 +6477,48 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 #, fuzzy
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "k"
@@ -6414,6 +6540,14 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-�losilparo havos 1024 bitojn.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
+
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 8393efd28..39cbaa4f1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2007-10-23 11:32+0200\n"
 "Last-Translator: Jaime Su�rez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -42,13 +42,12 @@ msgstr "no se puede bloquear `%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -86,9 +85,10 @@ msgstr "no se puede leer `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -143,173 +143,219 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creaci�n: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "el acceso a �rdenes de administrador no est� configurado\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Administrador"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "PIN [firmas hechas: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "el acceso a �rdenes de administrador no est� configurado\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "clave p�blica no disponible"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Por favor elija una raz�n para la revocaci�n:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "generando nueva clave\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [firmas hechas: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -394,165 +440,227 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Esta orden no se permite en modo %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error creando `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "redondeados a %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "clave secreta ya almacenada en una tarjeta\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,138 +671,147 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "clave secreta no disponible"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -703,36 +820,36 @@ msgstr ""
 "Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Pulse Intro cuando est� listo"
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Introduzca nuevo PIN de administrador: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Introduzca el nuevo PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Introduzca PIN de administrador: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Introduzca PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Repita este PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -741,13 +858,13 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -850,7 +967,7 @@ msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
@@ -1253,7 +1370,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -1261,7 +1378,7 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1404,401 +1521,401 @@ msgstr "No existe la firma correspondiente en el anillo secreto\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "la URL del servidor de claves preferido no es v�lida\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "`%s' no es un juego de caracteres v�lido\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "la URL del servidor de claves preferido no es v�lida\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "`%s' no es un juego de caracteres v�lido\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
@@ -1846,17 +1963,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
@@ -1886,8 +2003,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
@@ -2690,12 +2808,12 @@ msgstr "error escribiendo anillo `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
@@ -2744,7 +2862,7 @@ msgstr "Detectado 1 identificador de usuario sin autofirma v
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2756,12 +2874,12 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
@@ -2977,8 +3095,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -2989,19 +3107,19 @@ msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3018,7 +3136,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -3332,114 +3450,114 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3447,17 +3565,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3465,7 +3583,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3474,75 +3592,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3551,253 +3669,254 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
@@ -3810,109 +3929,104 @@ msgstr "Autentificaci
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA y ElGamal (por defecto)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (permite elegir capacidades)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (s�lo cifrar)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (s�lo cifrar)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (permite elegir capacidades)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "El par de claves DSA tendr� %u bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "redondeados a %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3928,7 +4042,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3944,38 +4058,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3983,11 +4097,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4003,44 +4117,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4051,7 +4165,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4068,23 +4182,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4092,12 +4206,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4109,7 +4223,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4122,50 +4236,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4173,12 +4287,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4186,7 +4300,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4194,25 +4308,25 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4245,252 +4359,252 @@ msgstr "Notaci
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
@@ -4645,62 +4759,62 @@ msgstr "Firma correcta de \"%s\""
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -4739,59 +4853,64 @@ msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -4843,12 +4962,12 @@ msgstr "directorio `%s' creado\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -4934,7 +5053,7 @@ msgstr "         (subclave en clave principal ID %s)"
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4948,58 +5067,58 @@ msgstr ""
 "Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
 "Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Imposible abrir fichero JPEG `%s': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
@@ -5019,46 +5138,46 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "No hay confianza definida para:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
 "que se nombra?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No lo s� o prefiero no decirlo\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO tengo confianza\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = conf�o absolutamente\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = volver al men� principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = saltar esta clave\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  q = salir\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5067,41 +5186,41 @@ msgstr ""
 "El m�nimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "�Su decisi�n? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: No hay seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5111,110 +5230,110 @@ msgstr ""
 "identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
 "puede contestar s� a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5222,33 +5341,33 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -5315,7 +5434,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
@@ -5337,11 +5456,11 @@ msgstr "(Este es una clave de revocaci
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
@@ -5360,28 +5479,28 @@ msgstr "no se encuetran claves de revocaci
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5400,33 +5519,33 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
@@ -5504,17 +5623,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5522,7 +5641,7 @@ msgstr ""
 "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5530,23 +5649,23 @@ msgstr ""
 "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@ -5684,12 +5803,12 @@ msgstr "error de lectura `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5734,86 +5853,85 @@ msgstr "%s: se ha creado base de datos de confianza inv
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"La base de datos de confianza est� da�ada. Por favor, ejecute\n"
-"\"gpg --fix-trust-db\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: se ha creado base de datos de confianza\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5860,126 +5978,134 @@ msgstr "registro de confianza %lu, petici
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 "con el modelo de confianza `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5987,7 +6113,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6275,47 +6401,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "fin"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "vale|Vale"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "cancelar|Cancelar"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "vV"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6335,6 +6461,17 @@ msgstr "operaci
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "El par de claves DSA tendr� %u bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
+#~ "\"gpg --fix-trust-db\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN Administrador"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
 
@@ -7389,9 +7526,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "Too many preference items"
 #~ msgstr "Demasiados �tems de preferencias"
 
-#~ msgid "public key not anymore available"
-#~ msgstr "clave p�blica no disponible"
-
 #~ msgid "insert_trust_record: keyblock not found: %s\n"
 #~ msgstr "insert_trust_record: bloque de clave no encontrado: %s\n"
 
@@ -7419,9 +7553,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "no puede bloquearse el anillo p�blico `%s': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "error escribiendo anillo `%s': %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escribiendo bloque de claves\n"
 
diff --git a/po/et.po b/po/et.po
index 2baadf7c5..334362e3a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -38,13 +38,12 @@ msgstr "`%s' ei 
 msgid "waiting for lock on `%s'...\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -76,9 +75,10 @@ msgstr "`%s' ei 
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -131,176 +131,220 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "viga v�tmebloki lugemisel: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: viga vaba kirje lugemisel: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' on juba pakitud\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "genereeri uus v�tmepaar"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "V�tme genereerimine eba�nnestus: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Palun valige t�histamise p�hjus:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "viga v�tmebloki lugemisel: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' on juba pakitud\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genereeri uus v�tmepaar"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "genereeri uus v�tmepaar"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -386,176 +430,238 @@ msgid ""
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "�mardatud �les %u bitini\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,192 +669,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -757,13 +872,13 @@ msgstr "`%s' ei 
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -866,7 +981,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
@@ -1267,7 +1382,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "�iffer: "
 
@@ -1275,7 +1390,7 @@ msgstr "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Pakkimine: "
 
@@ -1412,411 +1527,411 @@ msgstr "Vastavat allkirja salajaste v
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "antud allkirja poliisi URL on vigane\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s ei ole lubatud kooditabel\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "antud allkirja poliisi URL on vigane\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
@@ -1864,17 +1979,17 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -1900,8 +2015,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
@@ -2690,12 +2806,12 @@ msgstr "viga v
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
@@ -2744,7 +2860,7 @@ msgstr "tuvastasin 
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2757,12 +2873,12 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
@@ -3000,8 +3116,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3010,20 +3126,20 @@ msgstr "allkirjastamine eba
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3040,7 +3156,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -3382,117 +3498,117 @@ msgstr "Kas uuendan t
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3500,19 +3616,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3520,7 +3636,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3529,75 +3645,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3606,264 +3722,265 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3876,109 +3993,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "�mardatud �les %u bitini\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3994,7 +4106,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4010,40 +4122,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4051,12 +4163,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4072,44 +4184,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4120,7 +4232,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4135,23 +4247,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4159,12 +4271,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4176,7 +4288,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4188,50 +4300,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4241,43 +4353,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -4310,254 +4422,254 @@ msgstr "Allkirja noteerimine: "
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -4711,62 +4823,62 @@ msgstr "Korrektne allkiri kasutajalt \""
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -4806,61 +4918,66 @@ msgstr "realiseerimata 
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA �ifri lisandprogrammi pole\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = esita palun t�iendavat infot\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �ifri lisandprogrammi pole\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = esita palun t�iendavat infot\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -4913,13 +5030,13 @@ msgstr "%s: kataloog on loodud\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -5007,7 +5124,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5021,59 +5138,59 @@ msgstr ""
 "v�ga suurt pilti, on ka k�ti v�ha suur!\n"
 "M�istlik pildi suurus v�iks olla umbes 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
@@ -5096,87 +5213,87 @@ msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " t = tagasi p�himen��sse\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "See v�ti kuulub meile\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5188,109 +5305,109 @@ msgstr ""
 "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5298,33 +5415,33 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
@@ -5391,7 +5508,7 @@ msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
@@ -5414,11 +5531,11 @@ msgstr "(See on tundlik t
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
@@ -5439,29 +5556,29 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5482,33 +5599,33 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
@@ -5584,44 +5701,44 @@ msgstr "HOIATUS: allkirjastamise alamv
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
@@ -5765,12 +5882,12 @@ msgstr "viga lugemisel: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -5814,84 +5931,85 @@ msgstr "%s: loodi vigane usalduse andmebaas\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: trustdb on loodud\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5938,130 +6056,138 @@ msgstr "usalduse kirje %lu, p
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6323,47 +6449,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "jah"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "v�lju"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "vV"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6384,6 +6510,13 @@ msgstr "initsialiseerimata turvalise m
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
 
diff --git a/po/fi.po b/po/fi.po
index faaf8ce71..2ab504b6a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -54,13 +54,12 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -93,9 +92,10 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -149,177 +149,221 @@ msgstr ""
 "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
 "(Vielä tarvitaan %d tavua)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "virhe luettaessa avainlohkoa: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "\"%s\" on jo pakattu\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "luo uusi avainpari"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Avaimen luonti epäonnistui: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Valitse mitätöinnin syy:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "virhe luettaessa avainlohkoa: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" on jo pakattu\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "luo uusi avainpari"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "luo uusi avainpari"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Avaimen luonti epäonnistui: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -407,176 +451,238 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "pyöristetty %u bittiin\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "ohitetaan: salainen avain on jo paikalla\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -584,192 +690,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -778,13 +893,13 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -884,7 +999,7 @@ msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@ -1287,7 +1402,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -1295,7 +1410,7 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Pakkaus: "
 
@@ -1432,412 +1547,412 @@ msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s ei kelpaa merkistöksi\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s ei kelpaa merkistöksi\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
@@ -1884,18 +1999,18 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -1923,8 +2038,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
@@ -2724,12 +2840,12 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -2779,7 +2895,7 @@ msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2792,12 +2908,12 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
@@ -3037,8 +3153,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3047,20 +3163,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3077,7 +3193,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -3419,117 +3535,117 @@ msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3537,19 +3653,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3557,7 +3673,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3566,75 +3682,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3644,268 +3760,269 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3918,109 +4035,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ja ElGamal (oletus)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (vain salaus)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (vain salaus)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (vain salaus)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-avainparissa on 1024 bittiä.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "pyöristetty %u bittiin\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4036,7 +4148,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4052,40 +4164,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4093,12 +4205,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4116,44 +4228,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4164,7 +4276,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4179,23 +4291,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4203,12 +4315,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4220,7 +4332,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4232,50 +4344,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4284,12 +4396,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4297,7 +4409,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4305,26 +4417,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4357,256 +4469,256 @@ msgstr "Allekirjoitusnotaatio: "
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -4763,65 +4875,65 @@ msgstr "Allekirjoitus täsmää lähettäjään \""
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -4862,61 +4974,66 @@ msgstr "salausalgoritmi ei ole käytössä"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = näytä lisätietoja\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = näytä lisätietoja\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -4971,11 +5088,11 @@ msgstr "%s: hakemisto luotu\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -5062,7 +5179,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5077,59 +5194,59 @@ msgstr ""
 "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
 "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
@@ -5152,91 +5269,91 @@ msgstr ""
 "Luottamusarvoa ei ole asetettu seuraavalle:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = En tiedä\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EN luota\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Luotan ehdottomasti\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = takaisin päävalikkoon\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = ohita tämä avain\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " l = lopeta\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Valintasi? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5248,114 +5365,114 @@ msgstr ""
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5363,33 +5480,33 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
@@ -5457,7 +5574,7 @@ msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
@@ -5480,11 +5597,11 @@ msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
@@ -5503,29 +5620,29 @@ msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5545,33 +5662,33 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
@@ -5648,17 +5765,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5666,7 +5783,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5674,24 +5791,24 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
@@ -5838,12 +5955,12 @@ msgstr "lukuvirhe: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
@@ -5887,84 +6004,85 @@ msgstr "%s: luotu trustdb ei kelpaa\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: trustdb luotu\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6012,130 +6130,138 @@ msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6397,47 +6523,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "lLsS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6458,6 +6584,13 @@ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-avainparissa on 1024 bittiä.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
diff --git a/po/fr.po b/po/fr.po
index 675f483c3..cb1e490f0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.9\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2009-06-17 11:45+0200\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2009-06-17 11:46+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -43,13 +43,12 @@ msgstr "impossible de verrouiller `%s': %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "attente du verrou sur `%s'...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2499
-#: g10/keyring.c:1538 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:604
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -83,9 +82,10 @@ msgstr "impossible de lire `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2980
-#: g10/keygen.c:3010 g10/keyring.c:1204 g10/keyring.c:1514 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -140,179 +140,227 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
 "soit irr�m�diablement bloqu�e\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|code PIN d'administration"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "les parties secr�tes ne sont pas disponibles\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "choisissez la cause de la r�vocation:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+"Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
+"est %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "g�n�rer une nouvelle cl�\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la carte ne supporte pas l'algorithme de hachage %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -396,167 +444,229 @@ msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2683 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1401
-#: g10/keygen.c:1468
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Cette commande n'est pas admise en mode %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erreur pendant la cr�ation de `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arrondie � %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -567,139 +677,148 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1405 g10/keygen.c:1433 g10/keygen.c:1507 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2242
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "lecteur de cartes indisponible\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "s�lectionner openpgp a �chou� : %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -709,31 +828,31 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le nouveau code PIN admin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Entrez le nouveau code PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "R�p�tez ce code PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
@@ -747,13 +866,13 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1727
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1428,427 +1547,427 @@ msgstr "montrer les dates d'expiration en listant les signatures"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2291 g10/gpg.c:2952 g10/gpg.c:2971
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2304
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/gpg.c:2493 g10/gpg.c:2505
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2606 g10/gpg.c:2795 g10/keyedit.c:4078
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2618
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2631
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2638
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2641
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2648
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2651
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identit� pendant la v�rification de signatures"
 
-#: g10/gpg.c:2661
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "afficher les URLs de politique pendant la v�rification des signatures"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en v�rifiant les signatures"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 "utiliser les notations standard IETF pendant la v�rification des signatures"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur pendant la v�rification "
 "des signatures"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "montrer les URLs de serveur de cl� pr�f�r� pendant la v�rification\n"
 "des signatures"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr ""
 "montrer la validit� du nom d'utilisateur pendant la v�rification\n"
 "de signatures"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "indiquer les noms d'utilisateurs r�voqu�s et expir�s pendant la v�rification "
 "des signatures"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "ne montrer que le nom d'utilisateur principal pendant la v�rification\n"
 "de signature"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "valider les signatures avec les donn�es PKA"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "augmenter la confiance des signatures avec des donn�es PKA valides"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: liste de recherche de cl� automatique invalide\n"
 
-#: g10/gpg.c:2864
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de localisation automatique de cl�s invalide\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2945
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2964
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOTE: %s n'est pas disponible dans cette version\n"
 
-#: g10/gpg.c:2979
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2993
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:2999
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:3005
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:3085 g10/gpg.c:3109
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3091 g10/gpg.c:3115
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3103
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3120
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3122
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3124
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3126
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3140
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3242
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3247
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
@@ -1894,7 +2013,7 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2435 g10/keyedit.c:3721
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
@@ -3035,8 +3154,8 @@ msgstr "J'ai v
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3047,21 +3166,21 @@ msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3319
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3307 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3322
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3326
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3076,7 +3195,7 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1931
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
@@ -3469,7 +3588,7 @@ msgid "(sensitive)"
 msgstr "(sensible)"
 
 #: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
@@ -3486,7 +3605,7 @@ msgstr "expir
 
 #: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
-#: g10/keylist.c:911 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
@@ -3522,13 +3641,13 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:527
-#: g10/mainproc.c:1816 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:531
-#: g10/mainproc.c:1818 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "expir�e"
 
@@ -3590,7 +3709,7 @@ msgstr "%d signatures supprim
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "invalide"
 
@@ -3691,205 +3810,206 @@ msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sous-cl� de signature %s a d�j� une certification crois�e\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "la sous-cl� %s ne signe pas et n'a donc pas besoin d'une certification "
 "crois�e\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "Entrez la notation: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "Continuer ? (o/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:275
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:400
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:875
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:914
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:964
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1110 g10/keygen.c:1115 g10/keygen.c:1232
-#: g10/keygen.c:2877
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1032 g10/keygen.c:1121 g10/keygen.c:1237 g10/keygen.c:2883
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1330
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1333
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Certifier"
 
-#: g10/keygen.c:1336
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Authentifier"
 
@@ -3902,109 +4022,104 @@ msgstr "Authentifier"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1356
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1391
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1397
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1455
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1456
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1458
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
-
-#: g10/keygen.c:1460
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (chiffrement seul)\n"
-
-#: g10/keygen.c:1461
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (chiffrement seul)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1465
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1534
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "La paire de cl�s DSA fera %u bits.\n"
-
-#: g10/keygen.c:1544
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1565
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
-
-#: g10/keygen.c:1571
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1576 g10/keygen.c:1581
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "arrondie � %u bits\n"
-
-#: g10/keygen.c:1648
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4020,7 +4135,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4036,38 +4151,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1685
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1703 g10/keygen.c:1728
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1716
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1717
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1721
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4075,11 +4190,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4095,44 +4210,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> �\n"
 "\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1770
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1772
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1774
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1788
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1831
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4143,7 +4258,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4159,23 +4274,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1852
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1862
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1863
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1882
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1922
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4184,12 +4299,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1932 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:2011
 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"
@@ -4203,7 +4318,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1960
+#: g10/keygen.c:2033
 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"
@@ -4215,52 +4330,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2823
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3023 g10/keygen.c:3172
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3025 g10/keygen.c:3175
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3178
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3161
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3185
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3192
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3215
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3226
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4269,13 +4384,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3238 g10/keygen.c:3367 g10/keygen.c:3482
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3290 g10/keygen.c:3417 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4283,7 +4398,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3292 g10/keygen.c:3419 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4291,26 +4406,26 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3301 g10/keygen.c:3430
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3340 g10/keygen.c:3463
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3628
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3675
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3701
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -4398,204 +4513,204 @@ msgstr "R
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1435
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1447
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1518
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "inclure les cl�s r�voqu�es dans les r�sultats de recherche"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "inclure les sous-cl�s en cherchant par ID de cl�"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "utiliser des fichiers temporaires pour passer les donn�es aux aides pour\n"
 "serveurs de cl�s"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "ne pas supprimer les fichiers temporaires apr�s les avoir utilis�s"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "r�cup�rer les cl�s automatiquement en v�rifiant les signatures"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "honorer l'URL de serveur de cl�s pr�f�r� indiqu� dans la cl�"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 "honorer l'enregistrement PKA positionn� sur une cl� en r�cup�rant les cl�s"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1434
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1153
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1157
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1181
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de noms du %s serveur %s\n"
 
-#: g10/keyserver.c:1184
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de noms de %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2035
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISSEMENT: impossible de r�cup�rer l'URI %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISSEMENT: impossible d'analyser l'URI %s\n"
@@ -4777,7 +4892,7 @@ msgstr "binaire"
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1917 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "inconnu"
 
@@ -4852,61 +4967,66 @@ msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "merci de voir %s pour plus d'informations\n"
 
-#: g10/misc.c:715
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "NOTE: %s n'est pas disponible dans cette version\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:721
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
-#: g10/misc.c:766
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:893
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1068
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1093
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -5102,23 +5222,23 @@ msgstr "aucun visionneur de photos n'a 
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
@@ -5186,7 +5306,7 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:301 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
@@ -5444,7 +5564,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
@@ -5466,11 +5586,11 @@ msgstr "(c'est une cl
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
@@ -5489,28 +5609,28 @@ msgstr "aucune cl
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5530,33 +5650,33 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
@@ -5668,19 +5788,19 @@ msgstr ""
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %s a expir� le %s\n"
 
-#: g10/sig-check.c:323
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:581
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:607
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5955,9 +6075,10 @@ msgstr "%s: n'a pu mettre un enregistrement 
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1503
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
+#: g10/tdbio.c:1502
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: base de confiance cr��e\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6006,128 +6127,136 @@ msgstr ""
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
 "on utilise � la place le mod�le de confiance %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2447
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "v�rification de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "mise � jour de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2190
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2255
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2269
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2292
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2378
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6135,7 +6264,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2453
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6459,3 +6588,12 @@ msgstr ""
 #: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
+
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La paire de cl�s DSA fera %u bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|code PIN d'administration"
diff --git a/po/gl.po b/po/gl.po
index 56558113f..d253bb2d9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -38,13 +38,12 @@ msgstr "non se puido abrir `%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -76,9 +75,10 @@ msgstr "non se pode ler de `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -134,176 +134,221 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "o env�o ao servidor de chaves fallou: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "erro ao le-lo bloque de chaves: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro ao ler un rexistro libre: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' xa est� comprimido\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "xerar un novo par de chaves"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A xeraci�n da chave fallou: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "Sinatura %s, algoritmo de resumo %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "o env�o ao servidor de chaves fallou: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "Introduza o ID de usuario: "
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "hai partes da chave secreta non dispo�ibles\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro ao le-lo bloque de chaves: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler un rexistro libre: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' xa est� comprimido\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "xerar un novo par de chaves"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "xerar un novo par de chaves"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A xeraci�n da chave fallou: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -390,176 +435,238 @@ msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Non se admite este comando no modo %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro ao crear `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "redondeado a %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "om�tese: a chave secreta xa est� presente\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -567,195 +674,204 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -764,13 +880,13 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -876,7 +992,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
@@ -1278,7 +1394,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1286,7 +1402,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1423,415 +1539,415 @@ msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s non � un xogo de caracteres v�lido\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s non � un xogo de caracteres v�lido\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
@@ -1878,18 +1994,18 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -1915,8 +2031,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
@@ -2717,12 +2834,12 @@ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
@@ -2771,7 +2888,7 @@ msgstr "detectado 1 ID de usuario sin auto-sinatura v
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2783,12 +2900,12 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
@@ -3025,8 +3142,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3035,20 +3152,20 @@ msgstr "fallou a sinatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3065,7 +3182,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -3415,117 +3532,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3533,19 +3650,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3553,7 +3670,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3562,77 +3679,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3642,272 +3759,273 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3920,109 +4038,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (por defecto)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (s� cifrar)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (s� cifrar)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (s� cifrar)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (s� cifrar)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "O par de chaves DSA ha ter 1024 bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "redondeado a %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4038,7 +4151,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4054,40 +4167,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4095,12 +4208,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4117,44 +4230,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4165,7 +4278,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4181,23 +4294,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4205,12 +4318,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4222,7 +4335,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4234,50 +4347,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4287,12 +4400,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4300,7 +4413,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4308,26 +4421,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4360,255 +4473,255 @@ msgstr "Notaci
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -4762,63 +4875,63 @@ msgstr "Sinatura correcta de \""
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -4860,61 +4973,66 @@ msgstr "algoritmo de cifrado non implementado"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "o plugin de cifra IDEA non est� presente\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = amosar m�is informaci�n\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "o plugin de cifra IDEA non est� presente\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = amosar m�is informaci�n\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -4967,12 +5085,12 @@ msgstr "%s: directorio creado\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -5060,7 +5178,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5074,59 +5192,59 @@ msgstr ""
 "p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
 "moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" non � un ficheiro JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�� esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
@@ -5149,89 +5267,89 @@ msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non sei\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON conf�o\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao men� principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omitir esta chave\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Esta chave pert�ncenos a n�s\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5243,114 +5361,114 @@ msgstr ""
 "respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5358,34 +5476,34 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
@@ -5452,7 +5570,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
@@ -5475,11 +5593,11 @@ msgstr "(Esta 
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
@@ -5498,29 +5616,29 @@ msgstr "non se atoparon chaves de revocaci
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5538,33 +5656,33 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
@@ -5645,17 +5763,17 @@ msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5663,7 +5781,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5671,26 +5789,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
 "desco�ecido\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
@@ -5831,12 +5949,12 @@ msgstr "erro de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5881,86 +5999,85 @@ msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
-"\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: creouse a base de datos de confianza\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6008,130 +6125,138 @@ msgstr "rexistro de confianza %lu, tipo da petici
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6394,47 +6519,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "si|sim"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "non|nom"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "abandonar"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "v"
@@ -6455,6 +6580,15 @@ msgstr "a operaci
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ha ter 1024 bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
+#~ "\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
diff --git a/po/hu.po b/po/hu.po
index 0f4542317..5e74cf4da 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -38,13 +38,12 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -77,9 +76,10 @@ msgstr "Nem tudom olvasni a(z) \"%s\" 
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -133,176 +133,220 @@ msgstr ""
 "m�st, hogy az oper�ci�s rendszer entr�pi�t gy�jthessen!\n"
 "(M�g %d b�jt sz�ks�ges.)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "\"%s\" m�r t�m�r�tett.\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "�j kulcsp�r l�trehoz�sa"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Kulcsgener�l�s sikertelen: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" m�r t�m�r�tett.\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "�j kulcsp�r l�trehoz�sa"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "�j kulcsp�r l�trehoz�sa"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -388,176 +432,238 @@ msgid ""
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "Felkerek�tve %u bitre.\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -565,192 +671,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -759,13 +874,13 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -865,7 +980,7 @@ msgstr "A %s (%d) t
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
@@ -1265,7 +1380,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
@@ -1273,7 +1388,7 @@ msgstr "Rejtjelez
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
@@ -1410,412 +1525,412 @@ msgstr "Nincs megfelel
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
@@ -1863,18 +1978,18 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
@@ -1900,8 +2015,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Szintaxis: gpg [opci�k] [f�jlok]\n"
@@ -2701,12 +2817,12 @@ msgstr "Hiba a(z) \"%s\" kulcskarika l
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
@@ -2755,7 +2871,7 @@ msgstr "1 felhaszn
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2768,12 +2884,12 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
@@ -3010,8 +3126,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3020,20 +3136,20 @@ msgstr "Al
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3050,7 +3166,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -3392,117 +3508,117 @@ msgstr "Val
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3510,19 +3626,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3530,7 +3646,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3540,75 +3656,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3618,266 +3734,267 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3890,109 +4007,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (csak titkos�t�s)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "Felkerek�tve %u bitre.\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4008,7 +4120,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4024,40 +4136,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4065,12 +4177,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4087,44 +4199,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4135,7 +4247,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4150,24 +4262,24 @@ msgstr "K
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4175,12 +4287,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4192,7 +4304,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4204,50 +4316,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4257,46 +4369,46 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -4329,257 +4441,257 @@ msgstr "Al
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -4737,62 +4849,62 @@ msgstr "J
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -4833,62 +4945,67 @@ msgstr "nem megval
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = tov�bbi inform�ci�kat k�rek\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = tov�bbi inform�ci�kat k�rek\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -4942,12 +5059,12 @@ msgstr "%s: K
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -5039,7 +5156,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5053,59 +5170,59 @@ msgstr ""
 "k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
 "A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG �llom�ny.\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fot� megfelel� (i/N/k)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
@@ -5128,89 +5245,89 @@ msgstr ""
 "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nem tudom\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NEM b�zom benne\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = alapvet�en megb�zom benne\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " f = visszat�r�s a f�men�be\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " k = kil�p�s\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozz�nk tartozik.\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5222,110 +5339,110 @@ msgstr ""
 "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5333,34 +5450,34 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
@@ -5428,7 +5545,7 @@ msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
@@ -5451,11 +5568,11 @@ msgstr "(Ez egy 
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
@@ -5474,29 +5591,29 @@ msgstr "Nem tal
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5514,33 +5631,33 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
@@ -5617,48 +5734,48 @@ msgstr "FIGYELEM: %08lX al
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
@@ -5806,12 +5923,12 @@ msgstr "Olvas
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
@@ -5855,84 +5972,85 @@ msgstr "%s: 
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5980,130 +6098,138 @@ msgstr "%lu bizalmi rekord, %d k
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6365,47 +6491,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "igen"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "iI"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nem"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6426,6 +6552,13 @@ msgstr "A m
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
 
diff --git a/po/id.po b/po/id.po
index 612a76da1..45d792de1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -40,13 +40,12 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -78,9 +77,10 @@ msgstr "tidak dapat membaca `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -134,176 +134,220 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Pengiriman keyserver gagal: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "gagal membaca keyblock: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: kesalahan membaca record bebas: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' sudah dikompresi\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "buat sepasang kunci baru"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "gagal inisialisasi TrustDB: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Pembuatan kunci gagal: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s signature, algoritma digest %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Pengiriman keyserver gagal: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "bagian kunci rahasia tidak tersedia\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Silakan pilih alasan untuk pembatalan:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "gagal membaca keyblock: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: kesalahan membaca record bebas: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' sudah dikompresi\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "buat sepasang kunci baru"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "buat sepasang kunci baru"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -390,176 +434,238 @@ msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "kesalahan penciptaan : `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "dibulatkan hingga %u bit\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "dilewati: kunci pribadi telah ada\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -567,192 +673,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -761,13 +876,13 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -869,7 +984,7 @@ msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@ -1269,7 +1384,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1277,7 +1392,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Kompresi: "
 
@@ -1414,420 +1529,420 @@ msgstr "Tidak ada signature koresponden di ring rahasia\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s bukanlah set karakter yang valid\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "URL signature kebijakan yang diberikan tidak valid\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s bukanlah set karakter yang valid\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
@@ -1873,17 +1988,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -1909,8 +2024,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaks: gpg [options] [files]\n"
@@ -2713,12 +2829,12 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
@@ -2767,7 +2883,7 @@ msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2780,12 +2896,12 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
@@ -3026,8 +3142,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3036,20 +3152,20 @@ msgstr "gagal menandai: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3066,7 +3182,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -3408,117 +3524,117 @@ msgstr "Perbarui preferensi untuk user ID terpilih?"
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3526,19 +3642,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3546,7 +3662,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3556,75 +3672,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3634,269 +3750,270 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3909,109 +4026,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "  (%d) DSA dan ElGamal (baku)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "  (%d) RSA (hanya enkripsi)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "  (%d) ElGamal (hanya enkripsi)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "  (%d) ElGamal (hanya enkripsi)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "  (%d) RSA (hanya enkripsi)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "dibulatkan hingga %u bit\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4027,7 +4139,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4043,40 +4155,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4084,12 +4196,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4105,44 +4217,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4152,7 +4264,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4167,23 +4279,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4191,12 +4303,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4209,7 +4321,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4221,50 +4333,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4274,45 +4386,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4345,254 +4457,254 @@ msgstr "Notasi signature: "
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -4746,63 +4858,63 @@ msgstr "Signature baik dari \""
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -4841,60 +4953,65 @@ msgstr "algoritma cipher belum diimplementasikan"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -4947,11 +5064,11 @@ msgstr "%s: direktori tercipta\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -5039,7 +5156,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5055,59 +5172,59 @@ msgstr ""
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
@@ -5130,89 +5247,89 @@ msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Tidak tahu\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d: Saya TIDAK percaya\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = lewati kunci ini\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5224,110 +5341,110 @@ msgstr ""
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5335,33 +5452,33 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -5428,7 +5545,7 @@ msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
@@ -5451,11 +5568,11 @@ msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
@@ -5474,29 +5591,29 @@ msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5516,34 +5633,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
@@ -5619,48 +5736,48 @@ msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
@@ -5806,12 +5923,12 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -5855,84 +5972,85 @@ msgstr "%s: tercipta trustdb tidak valid\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: tercipta trustdb\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5979,130 +6097,138 @@ msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6364,47 +6490,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "y|ya"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "n|t|tidak"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6426,6 +6552,13 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Keypair DSA akan memiliki 1024 bit.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
 
diff --git a/po/it.po b/po/it.po
index 2651b331b..a264d8af4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -38,13 +38,12 @@ msgstr "impossibile aprire `%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -77,9 +76,10 @@ msgstr "impossibile leggere `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -135,176 +135,220 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "invio al keyserver fallito: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "errore leggendo il keyblock: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' � gi� compresso\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "genera una nuova coppia di chiavi"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Generazione della chiave fallita: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "invio al keyserver fallito: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "parti della chiave segreta non sono disponibili\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Per favore scegli il motivo della revoca:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "errore leggendo il keyblock: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: errore durante la lettura del record libero: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' � gi� compresso\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera una nuova coppia di chiavi"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "genera una nuova coppia di chiavi"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -391,177 +435,239 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Questo comando non � permesso in modalit� %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "errore creando `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arrotondate a %u bit\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "errore leggendo il keyblock segreto `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "saltata: chiave pubblica gi� presente\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -569,192 +675,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -763,13 +878,13 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -879,7 +994,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
@@ -1280,7 +1395,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -1288,7 +1403,7 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compressione: "
 
@@ -1426,416 +1541,416 @@ msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "l'URL della politica di firma indicato non � valido\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s non � un set di caratteri valido\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "l'URL della politica di firma indicato non � valido\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s non � un set di caratteri valido\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
@@ -1881,18 +1996,18 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -1918,8 +2033,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
@@ -2726,12 +2842,12 @@ msgstr "errore creando il portachiavi `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@ -2780,7 +2896,7 @@ msgstr "Trovato un user ID senza autofirma valida\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2793,12 +2909,12 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
@@ -3037,8 +3153,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3047,20 +3163,20 @@ msgstr "firma fallita: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3077,7 +3193,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -3419,117 +3535,117 @@ msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3538,19 +3654,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3559,7 +3675,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3568,76 +3684,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3647,275 +3763,276 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3928,109 +4045,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (default)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (cifra solo)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (cifra solo)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (cifra solo)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "La coppia DSA avr� 1024 bit.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "arrotondate a %u bit\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4046,7 +4158,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4062,40 +4174,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4103,12 +4215,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4125,44 +4237,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4173,7 +4285,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4188,23 +4300,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4212,12 +4324,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4229,7 +4341,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4241,50 +4353,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4294,12 +4406,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4307,7 +4419,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4315,26 +4427,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4367,162 +4479,162 @@ msgstr "Annotazione della firma: "
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4530,94 +4642,94 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@ -4771,62 +4883,62 @@ msgstr "Firma valida da \""
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -4866,61 +4978,66 @@ msgstr "algoritmo di cifratura non implementato"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "il plugin per il cifrario IDEA non � presente\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = mostrami ulteriori informazioni\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "il plugin per il cifrario IDEA non � presente\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = mostrami ulteriori informazioni\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Non compresso"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -4975,13 +5092,13 @@ msgstr "%s: directory creata\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -5069,7 +5186,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5086,59 +5203,59 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": non � un file JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto � giusta? (s/N/q) "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
@@ -5161,89 +5278,89 @@ msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non lo so\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON mi fido\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = salta questa chiave\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5255,112 +5372,112 @@ msgstr ""
 "rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
 "non � presente).\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5368,33 +5485,33 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -5463,7 +5580,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
@@ -5486,11 +5603,11 @@ msgstr "(Questa 
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
@@ -5509,29 +5626,29 @@ msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5551,33 +5668,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
@@ -5660,17 +5777,17 @@ msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
 "non valida\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5678,7 +5795,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5686,26 +5803,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5855,12 +5972,12 @@ msgstr "errore di lettura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -5904,84 +6021,85 @@ msgstr "%s: 
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: creato il trustdb\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6029,130 +6147,138 @@ msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6415,47 +6541,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "si|s�"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6476,6 +6602,13 @@ msgstr "l'operazione non 
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La coppia DSA avr� 1024 bit.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
 
diff --git a/po/ja.po b/po/ja.po
index de898a484..de16cd256 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -41,13 +41,12 @@ msgstr "
 msgid "waiting for lock on `%s'...\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -79,9 +78,10 @@ msgstr "
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
@@ -134,173 +134,219 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-#, fuzzy
-msgid "|AN|New Admin PIN"
-msgstr "|A|������Admin PIN"
-
-#: g10/app-openpgp.c:1490
-#, fuzzy
-msgid "|N|New PIN"
-msgstr "������PIN"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "������PIN�μ������顼: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "���Ϥ⤦����ޤ�\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "��������������\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
-
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "�������δ֡����Ԥ��������� ...\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "���������˼��Ԥ��ޤ���\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "������������λ���ޤ��� (%d��)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "����ޤǤ˺������줿��̾: %lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "PIN [��̾��: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "PIN [��̾��: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "PIN [��̾��: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "��̩��ʬ�������ޤ���\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "��������ͳ�����򤷤Ƥ�������:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "|A|������Admin PIN"
+
+#: g10/app-openpgp.c:2061
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "������PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "������PIN�μ������顼: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "���Ϥ⤦����ޤ�\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "��������������\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "��������������\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "�������δ֡����Ԥ��������� ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "���������˼��Ԥ��ޤ���\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "������������λ���ޤ��� (%d��)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "����ޤǤ˺������줿��̾: %lu\n"
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -385,163 +431,225 @@ msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "��%s�פκ������顼: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -552,138 +660,147 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "��̩���������ޤ���"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -692,38 +809,38 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -732,13 +849,13 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -834,7 +951,7 @@ msgstr "
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
@@ -1232,7 +1349,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
@@ -1240,7 +1357,7 @@ msgstr "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "����: "
 
@@ -1377,401 +1494,401 @@ msgstr "
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
@@ -1815,17 +1932,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
@@ -1853,8 +1970,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
@@ -2645,12 +2763,12 @@ msgstr "
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
@@ -2699,7 +2817,7 @@ msgstr "ͭ
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2710,12 +2828,12 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
@@ -2928,8 +3046,8 @@ msgstr "
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -2938,20 +3056,20 @@ msgstr "
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -2968,7 +3086,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -3301,45 +3419,45 @@ msgstr "
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3347,71 +3465,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3419,17 +3537,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3437,7 +3555,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3446,75 +3564,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3523,253 +3641,254 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -3782,109 +3901,104 @@ msgstr "Authenticate"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA��Elgamal (����)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3900,7 +4014,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3916,40 +4030,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3957,11 +4071,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3977,44 +4091,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4025,7 +4139,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4040,23 +4154,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4064,12 +4178,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4081,7 +4195,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4092,50 +4206,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4144,42 +4258,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4212,247 +4326,247 @@ msgstr "
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
@@ -4606,62 +4720,62 @@ msgstr "
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -4700,59 +4814,64 @@ msgstr "̤
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "̵����"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -4804,11 +4923,11 @@ msgstr "
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -4894,7 +5013,7 @@ msgstr "         (
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4908,58 +5027,58 @@ msgstr ""
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
 "�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG�ե������%s�פ������ޤ���: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "����JPEG�ϡ��������礭�� (%d�Х���) !\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
@@ -4979,82 +5098,82 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "�����٤����ꤵ��Ƥ��ޤ���:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  ��̾��%s��\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "���θ������Υ桼������ʤΤ��ܿͤΤ�Τ��ɤ������ɤ줯�餤���ѤǤ��ޤ���?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = �Τ�ʤ����ޤ��ϲ��Ȥ�����ʤ�\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = ���Ѥ� �ʤ�\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = ����Ū�˿��Ѥ���\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = �᡼�󡦥�˥塼�����\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  q = ��λ\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ�����������������������ޤ���\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5064,105 +5183,105 @@ msgstr ""
 "�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5170,33 +5289,33 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
@@ -5265,7 +5384,7 @@ msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5287,11 +5406,11 @@ msgstr "(
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5310,28 +5429,28 @@ msgstr "
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5349,33 +5468,33 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
@@ -5447,44 +5566,44 @@ msgstr "
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "�ٹ�: ̵������߾���������̾����%s�ˤ���ޤ�\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
@@ -5614,12 +5733,12 @@ msgstr "
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
@@ -5663,85 +5782,85 @@ msgstr "%s: ̵
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5788,131 +5907,139 @@ msgstr "
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6174,47 +6301,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6234,6 +6361,18 @@ msgstr "
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ�����"
+#~ "����\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
diff --git a/po/nb.po b/po/nb.po
index a045df9c7..f30218079 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -42,13 +42,12 @@ msgstr "kan ikke l
 msgid "waiting for lock on `%s'...\n"
 msgstr "venter p� l�sing av �%s� ...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -80,9 +79,10 @@ msgstr "kan ikke lese 
 msgid "note: random_seed file not updated\n"
 msgstr "merk: random_seed-fila ble ikke oppdatert\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
@@ -136,171 +136,215 @@ msgstr ""
 "arbeid for � gi operativsystemet en sjanse til � samle mer entropy!\n"
 "(Trenger %d flere byter)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN-callback returnerte en feil: %s\n"
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "bekreftelse av CHV%d mislyktes: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "feil ved henting av CHV-status fra kort\n"
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "kort er permanent l�st!\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Ny Admin PIN"
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "feil ved lesing av applikasjonsdata\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "feil ved lesing av fingeravtrykk DO\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "n�kkel finnes allerede\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "eksisterende n�kkel vil bli erstattet\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "generere en ny n�kkel\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "tidsstempel for opprettelse mangler\n"
-
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
-
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "vennligst vent mens n�kkel blir generert ...\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "n�kkelgenerering mislyktes\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "kortet st�tter ikke digestalgoritme %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "signaturer opprettet s� langt: %lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN-callback returnerte en feil: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "bekreftelse av CHV%d mislyktes: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "feil ved henting av CHV-status fra kort\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "kort er permanent l�st!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+msgid "Reset Code not or not anymore available\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2028
+msgid "||Please enter the Reset Code for the card"
+msgstr ""
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Ny Admin PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "feil ved henting av ny PIN: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "feil ved lesing av applikasjonsdata\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "feil ved lesing av fingeravtrykk DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "n�kkel finnes allerede\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "eksisterende n�kkel vil bli erstattet\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "generere en ny n�kkel\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "generere en ny n�kkel\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "tidsstempel for opprettelse mangler\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "klarte ikke � lagre n�kkelen: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "vennligst vent mens n�kkel blir generert ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "n�kkelgenerering mislyktes\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "kortet st�tter ikke digestalgoritme %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signaturer opprettet s� langt: %lu\n"
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -384,163 +428,225 @@ msgid ""
 msgstr ""
 "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "feil med �%s�: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rundet opp til %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -551,139 +657,148 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Vennligst sett inn kortet og trykk p� enter eller tast inn �c� for � avbryte: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -692,36 +807,36 @@ msgstr ""
 "Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Trykk p� enter n�r du er klar eller tast �c� for � avbryte: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Tast inn ny Admin-PIN: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Tast inn ny PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Tast inn Admin-PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Tast inn PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Gjenta denne PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -730,13 +845,13 @@ msgstr "kan ikke 
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -840,7 +955,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
@@ -1231,7 +1346,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1239,7 +1354,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Kompresjon: "
 
@@ -1381,399 +1496,399 @@ msgstr ""
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
@@ -1817,17 +1932,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
@@ -1853,8 +1968,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Bruksm�te: gpgv [valg] [filer]\n"
@@ -2576,12 +2692,12 @@ msgstr "feil ved opprettelse av n
 msgid "keyring `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "n�kkelblokkressurs �%s�: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -2630,7 +2746,7 @@ msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2641,12 +2757,12 @@ msgstr ""
 "andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
 "forskjellige kilder, osv.)\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Jeg stoler marginalt\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Jeg stoler fullt\n"
@@ -2857,8 +2973,8 @@ msgstr "Jeg har sjekket denne n
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -2867,19 +2983,19 @@ msgstr "signering mislyktes: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -2894,7 +3010,7 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
@@ -3197,460 +3313,461 @@ msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "for mange cipher-preferanser\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "for mange digest-preferanser\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "for mange kompresjons-preferanser\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -3667,109 +3784,104 @@ msgstr "Autentisere"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA og ElGamal (standard)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (sette dine egne muligheter)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (bare kryptering)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (bare kryptering)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (sette dine egne muligheter)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-n�kkelpar vil ha %u bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "rundet opp til %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3785,7 +3897,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3801,38 +3913,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3840,11 +3952,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3860,44 +3972,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3908,7 +4020,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -3924,23 +4036,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3948,12 +4060,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -3965,7 +4077,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -3977,50 +4089,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4029,13 +4141,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4044,7 +4156,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4052,27 +4164,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4105,246 +4217,246 @@ msgstr ""
 msgid "Keyring"
 msgstr "N�kkelknippe"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Fingeravtrykk for undern�kkel:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undern�kkel:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr " N�kkelfingeravtrykk ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cacher n�kkelknippet �%s�\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu n�kler cachet (%lu signaturer)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ADVARSEL: n�kkelserver-valget �%s� er ikke i bruk p� denne plattformen\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "utkoblet"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
@@ -4498,62 +4610,62 @@ msgstr "God signatur fra 
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4592,59 +4704,64 @@ msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -4696,11 +4813,11 @@ msgstr "katalogen 
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -4786,7 +4903,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Gjenta passfrase: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4795,58 +4912,58 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �pne JPEG-fil �%s�: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at du vil bruke den? (j/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "�%s� er ikke et JPEG-fil\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Ingen grunn er angitt"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "N�kkelen er overg�tt"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "N�kkelen har blitt kompromittert"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "N�kkelen er ikke lengre i bruk"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Brukerid er ikke lengre gyldig"
 
@@ -4866,87 +4983,87 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "Ingen tillitsverdi tilordnet til:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka �%s�\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
 "brukeren?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jeg vet ikke eller vil ikke uttale meg\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jeg stoler IKKE p� den\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jeg stoler fullstendig p� den\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = tilbake til hovedmenyen\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  q = avslutt\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Valget ditt? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig sette denne n�kkelen til fullstendig tillit? (j/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finnes ingen indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det er begrenset indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "denne n�kkelen tilh�rer oss\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -4956,110 +5073,110 @@ msgstr ""
 "brukeriden.  Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
 "neste sp�rsm�let med ja.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan bety at signaturen er falsk.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Merk: Denne n�kkelen er utg�tt!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Det er ingen indikasjon p� at signaturen tilh�rer eieren.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er sannsynligvis et FALSKNERI.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
 "signaturer!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer brukeren.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5067,33 +5184,33 @@ msgstr ""
 "\n"
 "Tast inn brukeriden.  Avslutt med en blank linje: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Det finnes ingen slik brukerid.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�kkel er utkoblet.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukjent standardmottaker �%s�\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adressater\n"
 
@@ -5161,7 +5278,7 @@ msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -5183,11 +5300,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
@@ -5206,28 +5323,28 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr ""
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5238,33 +5355,33 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr ""
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
@@ -5338,18 +5455,18 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
 # Er dette entallsformen av denne strengen?
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5358,7 +5475,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5366,22 +5483,22 @@ msgstr ""
 "n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
@@ -5509,12 +5626,12 @@ msgstr "lesefeil ved 
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5558,83 +5675,83 @@ msgstr ""
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
 
 #: g10/textfilter.c:147
@@ -5682,126 +5799,134 @@ msgstr ""
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ opphevet]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ utg�tt]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[ ukjent]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[ udef ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6057,47 +6182,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nei"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "avslutt"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6117,5 +6242,11 @@ msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha brukt feil program for denne oppgaven)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-n�kkelpar vil ha %u bits.\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
diff --git a/po/nl.po b/po/nl.po
index f8869aad4..cf8f5283c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.6\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2009-06-17 11:45+0200\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2007-03-05 10:27+0100\n"
 "Last-Translator: Ivar Snaaijer\n"
 "Language-Team: none\n"
@@ -62,13 +62,12 @@ msgstr "‘%s’ is in gebruik: %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "wacht op vrijkomen van ‘%s’...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2499
-#: g10/keyring.c:1538 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:604
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ‘%s’ niet openen: %s\n"
@@ -102,9 +101,10 @@ msgstr "kan ‘%s’ niet lezen: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noot: ’random_seed’ bestand wordt niet aangepast\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2980
-#: g10/keygen.c:3010 g10/keyring.c:1204 g10/keyring.c:1514 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ‘%s’ niet aanmaken: %s\n"
@@ -158,175 +158,221 @@ msgstr ""
 "Er zijn nog niet genoeg willekeurge gegevens. Ga alstublieft een ander\n"
 "programma gebruiken om het OS de kans te geven nog %d bytes te verzamelen\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Het was niet mogelijk de vingerafdruk op te slaan: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Het was niet mogelijk de aanmaakdatum op te slaan: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "het lezen van de publieke sleutel is mislukt: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "de teruggekregen informatie bevat geen publieke sleutel gegevens\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "de teruggekregen informatie bevat geen RSA modulus\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "de teruggekregen informatie bevatten geen RSA publiek exponent\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN reactie gaf een fout: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "controle CHV%d heeft gefaalt: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "toegang tot beheerders commando's is niet geconfigureerd\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "Ophalen van de CHV status geeft een fout\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "kaart is permanent geblokkeerd!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d beheerder PIN pogingen resteren voordat de kaart permanent geblokkeerd "
 "wordt\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Beheerders PIN"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "toegang tot beheerders commando's is niet geconfigureerd\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "secret key parts are not available\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nieuwe beheerders PIN"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Nieuwe PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fout met nieuwe PIN: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "fout bij het lezen van programma gegevens\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "fout bij het lezen van de vingerafdruk DO\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "de sleutel bestaat reeds\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "de bestaande sleutel zal worden vervangen\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "aanmaken nieuwe sleutel\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "aanmaken nieuwe sleutel\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr "aanmaaktijd informatie mist\n"
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA publieke exponent is niet aanwezig of is groter dan %d bits\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA priemgetal %s is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "het is mislukt om de sleutel op te slaan: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "wacht terwijl de sleutel wordt aangemaakt ...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "aanmaken van de sleutel is mislukt\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "het aanmaken van de sleutel is voltooid (in %d seconden)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "verkeerde structuur van de OpenPGP kaart (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "de kaart ondersteund het samenvattings algortime %s niet\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "momenteel gegenereerde ondertekeningen: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "controleren van de beheerders PIN is momenteel niet toegestaan met dit "
 "commando\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan %s niet benaderen - ongeldige OpenPGP kaart?\n"
@@ -411,168 +457,230 @@ msgstr ""
 "’quoted printable’ teken gevonden in versleutelings gegevens - \n"
 "mogelijk heeft de verzender een slecht gemaakt email programma gebruikt\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP kaart is niet beschikbaar: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP kaart nummer %s gevonden\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2683 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "dit is niet mogelijk in automatische modus\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1401
-#: g10/keygen.c:1468
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Dit commando is niet toegestaan in %s modus.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[niet ingesteld]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "vrouw"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "niet gespecifiseerd"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "niet geforceerd"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "geforceerd"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fout: Alleen platte ASCII is hier toegestaan.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fout: U mag het “<” teken hier niet gebruiken.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fout: U mag geen dubbele spatie gebruiken.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Achternaam van de kaarthouder: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Voornaam van de kaarthouder: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fout: Gecombineerde naam is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL om de publieke sleutel op te halen: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fout: URL is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fout bij het aanmaken van de sleutelring ‘%s’: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout tijdens het lezen van ‘%s’: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error creating ‘%s’: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Aanlog gegevens (Login naam): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fout: Aanlog gegevens zijn te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Geheime DO-gegevens: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fout: Geheime DO is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Taal voorkeur: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fout: verkeerde lengte van de voorkeursgegevens.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fout: ongeldige tekens in voorkeursgegevens.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geslacht ((M)Man, (F)Vrouw of spatie): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Fout: Ongeldige invoer.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA vingerafdruk: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fout: ongeldig vormgegeven vingerafdruk.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "sleutel actie is niet mogelijk: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "geen OpenPGP kaart"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fout bij het ophalen van sleutel gegevens: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vervangen bestaande sleutel? (j/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Welke sleutellengte wilt u? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Welke sleutellengte wilt u? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Welke sleutellengte wilt u? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "afgerond naar %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "Fout bij het lezen van geheim sleutelblok “%s”: %s\n"
+
+#: g10/card-util.c:1361
 #, fuzzy
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Moet er een externe reservekopie van de versleutel gegevens gemaakt worden? "
 "(J/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "geheime sleutel staat reeds op de kaart\n"
+
+#: g10/card-util.c:1378
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vervangen bestaande sleutels? (j/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -583,137 +691,146 @@ msgstr ""
 "   PIN = ‘%s’     Beherder PIN = ‘%s’\n"
 "U wordt aangeraden deze te wijzigen met het commando --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Selecteer het sleutel type:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Handtekening sleutel\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Codeer sleutel\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authorisatie sleutel\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1405 g10/keygen.c:1433 g10/keygen.c:1507 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Ongeldige selectie.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Selcteer waar de sleutel moet worden opgeslagen:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "onbekend beveiligings algoritme\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "geheime delen van de sleutel zijn niet beschikbaar\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "geheime sleutel staat reeds op de kaart\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "fout bij het schrijven naar sleutelring ‘%s’: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afsluiten van dit menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "tonen beheerder commando's"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "toon deze hulp"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "toon alle beschikbare gegevens"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "verander de naam van de kaarthouder"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "verander de URL van de sleutel"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "download de sleutel van de kaart URL"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "verander de aanlog naam"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "verander de taal voorkeur"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "verander de sexe van de kaarthouder"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "verander een CA vingerafdruk"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "wissel de ondertekening forceer PIN vlag"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "genereer nieuwe sleutels"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "keuzelijst voor het deblokkeren of veranderen van de PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "controleer de PIN en toon alle gegevens"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Beheerder commando\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Beheerder commando's zijn toegestaan\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Beheerder commando's zijn niet toegestaan\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2242
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ongeldig commando  (probeer “help”)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "kaartlezer is niet beschikbaar\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Plaats de kaart en druk op return (of ‘c‘ om te stoppen): "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "Selecteren van OpenPGP is mislukt: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -722,31 +839,31 @@ msgstr ""
 "Verwijder de huidige kaart en plaats de kaart terug met serienummer :\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Druk op return of ‘c‘ om te stoppen: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Geeft nieuwe beheerders PIN: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Geef nieuwe PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Geef beheerders PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Geef PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Herhaal de PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "de tweede PIN is niet gelijk, probeer opnieuw"
 
@@ -760,13 +877,13 @@ msgstr "kan ‘%s’ niet openen\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output werkt niet voor dit commando\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "sleutel ‘%s‘ niet gevonden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1727
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1423,413 +1540,413 @@ msgstr "tonen van verval datum bij sleutel lijsten"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Noot: oude standaard optie ‘%s‘ genegeerd\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Noot: geen standaard optie bestand ‘%s’\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optie bestand ‘%s’: %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lezen van opties uit ‘%s’\n"
 
-#: g10/gpg.c:2291 g10/gpg.c:2952 g10/gpg.c:2971
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Noot: %s is niet voor normaal gebruik!\n"
 
-#: g10/gpg.c:2304
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "versleutelalgoritme uitbreiding ‘%s’ is niet geladen door onveilige\n"
 "instellingen\n"
 
-#: g10/gpg.c:2493 g10/gpg.c:2505
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is geen geldige ondertekening vervaldatum\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’ is geen geldige tekenset\n"
 
-#: g10/gpg.c:2606 g10/gpg.c:2795 g10/keyedit.c:4078
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "het was niet mogelijk de sleutel server URL te lezen\n"
 
-#: g10/gpg.c:2618
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ongeldige sleutel server opties\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "ongeldige sleutel server opties\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ongeldige importeer opties\n"
 
-#: g10/gpg.c:2631
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "ongeldige importeer opties\n"
 
-#: g10/gpg.c:2638
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ongeldige exporteer opties\n"
 
-#: g10/gpg.c:2641
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "ongeldige exporteer opties\n"
 
-#: g10/gpg.c:2648
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ongeldige lijst opties\n"
 
-#: g10/gpg.c:2651
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "ongeldige lijst opties\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "tonen foto ID tijdens ondertekening controle"
 
-#: g10/gpg.c:2661
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "toon procedure URL tijdens ondertekening controle"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "toon alle opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "toon IETF opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2669
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "toon gebruiker opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "toon voorkeurs sleutel server tijdens ondertekening controle"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "toon gebruiker ID geldigheid tijdens ondertekening controle"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "Controleer ondertekeningen met PKA gegevens"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 "Verhoog het vertrouwen van ondertekeningen met goedgekeurde PKA gegevens"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ongeldige controle opties\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "ongeldige controle opties\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "het is onmogelijk het programma start pad aan te passen naar %s\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ongeldige auto-key-locate lijst\n"
 
-#: g10/gpg.c:2864
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "ongeldige auto-key-locate lijst\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "Waarschuwing: het programma kan een core bestand genereren!\n"
 
-#: g10/gpg.c:2945
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Waarschuwing: %s overschrijft %s\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s mag niet gebruikt worden met %s!\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s klopt niet samen met %s!\n"
 
-#: g10/gpg.c:2964
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "Noot: %s is niet beschikbaar in deze versie\n"
 
-#: g10/gpg.c:2979
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "werkt niet met onveilig geheugen door %s\n"
 
-#: g10/gpg.c:2993
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "allen ontkoppelde of platte tekst ondertekeningen zijn mogelijk in --pgp2 "
 "modus\n"
 
-#: g10/gpg.c:2999
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "het is niet mogelijk tegelijk te ondertekenen en versleutelen in --pgp2 "
 "modus\n"
 
-#: g10/gpg.c:3005
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "U moet bestanden (en geen pipe) gebruiken in --pgp2 modus.\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "versleutelen in --pgp2 modus heeft het IDEA versleutelalgoritme nodig\n"
 
-#: g10/gpg.c:3085 g10/gpg.c:3109
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ongeldig versleutelalgoritme gekozen\n"
 
-#: g10/gpg.c:3091 g10/gpg.c:3115
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "ongeldig samenvatting algoritme gekozen\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "ongeldige compressie gekozen\n"
 
-#: g10/gpg.c:3103
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "ongeldig certificaat samenvatting algoritme gekozen\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/gpg.c:3120
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed moet groter zijn dan 1\n"
 
-#: g10/gpg.c:3122
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth moet vallen tussen dan 1 en 255\n"
 
-#: g10/gpg.c:3124
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige default-cert-level; moet 0, 1, 2, of 3 zijn\n"
 
-#: g10/gpg.c:3126
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ongeldige min-cert-level; moet 1, 2, of 3 zijn\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Noot: eenvoudige S2K modus (0) wordt sterk afgeraden\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3\n"
 
-#: g10/gpg.c:3140
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "ongeldige standaard voorkeuren\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "ongeldig persoonlijk versleutelalgoritme voorkeur\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "ongeldig persoonlijk samenvattings algoritme voorkeur\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "ongeldig persoonlijk compressie algoritme voorkeur\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s werkt nog niet met %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "U mag versleutelalgoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3242
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "U mag samenvattings algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3247
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "U mag compressie algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "initialiseren van TrustDB is mislukt: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Waarschuwing: er zijn ontvangers (-r) opgegeven zonder publieke sleutel "
 "versleuteling\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrische versleuteling van ‘%s’ is mislukt: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "U kunt --symmetric --encrypt niet gebruiken met --s2k-mode 0 instelling\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "U kunt --symmetric --encrypt niet in %s modus gebruiken\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "U kunt --symmetric --sign --encrypt niet gebruiken met --s2k-mode 0 "
 "instelling\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "U kunt --symmetric --sign --encrypt niet in %s modus gebruiken\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruiker-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruiker-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruiker-id [commando's]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruiker-id] [sleutelringbestand]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sleutelserver verzending is mislukt: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "sleutelserver opvraging is mislukt: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "sleutel exporteren is mislukt: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sleutelserver zoekvraag is mislukt: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "sleutelserver verversing is mislukt: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "verwijderen van versleuteling is mislukt: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "plaatsen van versleuteling is mislukt: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig berichtsamenvattings algoritme ‘%s’\n"
@@ -1874,7 +1991,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ongeldeige sleutel %s is geldig gemaakt met --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2435 g10/keyedit.c:3721
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "geen geheime sub-sleutel voor publieke sub-sleutel %s - overgeslagen\n"
@@ -3031,8 +3148,8 @@ msgstr "Ik heb deze sleutel zorgvuldig gecontroleerd.\n"
 msgid "Really sign? (y/N) "
 msgstr "Weet u het zeker? (j/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekenen is mislukt: %s\n"
@@ -3043,19 +3160,19 @@ msgstr ""
 "Deze sleutel bestaat alleen uit een verwijzing -\n"
 "er is geen geheime zin om te veranderen.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3319
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3307 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime delen van primaire sleutels zijn niet beschikbaar.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3322
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime delen van primaire sleutels zijn opgeslagen op een kaart.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3326
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
@@ -3072,7 +3189,7 @@ msgstr ""
 "Geef de nieuwe 'geheime zin' voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1931
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "de geheime zin is niet twee keer hetzelfde; probeer opnieuw"
 
@@ -3471,7 +3588,7 @@ msgid "(sensitive)"
 msgstr "(gevoelig)"
 
 #: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "aangemaakt: %s"
@@ -3488,7 +3605,7 @@ msgstr "verlopen: %s"
 
 #: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
-#: g10/keylist.c:911 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "vervaldatum: %s"
@@ -3525,13 +3642,13 @@ msgstr ""
 "mogelijk\n"
 "incorrect is tot U de applicatie herstart.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:527
-#: g10/mainproc.c:1816 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "ingetrokken"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:531
-#: g10/mainproc.c:1818 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "verlopen"
 
@@ -3595,7 +3712,7 @@ msgstr "Ondertekeningen %d verwijderd.\n"
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "ongeldig"
 
@@ -3694,203 +3811,204 @@ msgstr "U kan de vervaldatum van een v3 sleutel niet veranderen\n"
 msgid "No corresponding signature in secret ring\n"
 msgstr "Er is geen overeenkomstige ondertekening in de geheime sleutel\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "ondertekening sub-sleutel %s is reeds bevestigd\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "sub-sleutel %s ondertekend niet en hoeft dus niet bevestigd te zijn\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Selecteer een (1) Gebruiker ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "v3 zelf-ondertekening op Gebruiker ID “%s” overgeslagen\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geef de URL van de sleutelserver van uw voorkeur: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Weet u zeker dat U deze wilt vervangen? (j/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt verwijderen? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "Geef de notatie: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Doorgaan? (j/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Er is geen Gebruiker ID met index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Er is geen Gebruiker ID met hash %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Er is geen subsleutel met index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Gebruiker ID: “%s”\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "Ondertekend met uw sleutel %s op %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (niet exporteerbaar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4655
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt intrekken? (j/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4659
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Aanmaken intrekkingscertificaat voor deze ondertekening? (j/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "U heeft deze Gebruiker IDs ondertekend op sleutel %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (niet intrekbaar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ingetrokken door uw sleutel %s op %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "U gaat deze ondertekeningen intrekken:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4761
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wilt u deze intrekcertificaten maken? (j/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Gebruiker ID “%s” is reeds ingetrokken\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Waarschuwing: een Gebruiker ID is %d seconden in de toekomst gedateerd\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Sleutel %s is reeds ingetrokken.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Sub-sleutel %s is reeds ingetrokken.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Tonen %s foto ID van formaat %ld voor sleutel %s (Gebruiker ID %d)\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "voorkeur ‘%s’ overgenomen\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "te veel versleutelalgoritme voorkeuren\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "te veel samenvattingsalgoritme voorkeuren\n"
 
-#: g10/keygen.c:275
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "te veel compressie voorkeuren\n"
 
-#: g10/keygen.c:400
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ongeldige waarde ‘%s’ in voorkeursinstellingen\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "directe ondertekening schrijven\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "zelf-ondertekening schrijven\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "sleutel koppel ondertekening schrijven\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1110 g10/keygen.c:1115 g10/keygen.c:1232
-#: g10/keygen.c:2877
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "sleutellengte is ongeldig; %u bits worden gebruikt\n"
 
-#: g10/keygen.c:1032 g10/keygen.c:1121 g10/keygen.c:1237 g10/keygen.c:2883
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "sleutellengte vergroot tot %u bits\n"
 
-#: g10/keygen.c:1330
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Ondertekenen (Sign)"
 
-#: g10/keygen.c:1333
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Certificeren"
 
-#: g10/keygen.c:1336
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Versleutelen (Encrypt)"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Authenticeren"
 
@@ -3903,109 +4021,104 @@ msgstr "Authenticeren"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1356
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "OoVvAaSs"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mogelijke acties voor een %s sleutel: "
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Momenteel toegestane acties: "
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Onderteken mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1391
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Versleutel mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Authenticatie mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1397
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Voltooid\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer het soort sleutel dat u wilt:\n"
 
-#: g10/keygen.c:1455
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA en Elgamal (default)\n"
 
-#: g10/keygen.c:1456
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA en Elgamal (default)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1458
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (eigen mogelijkheden instellen)\n"
-
-#: g10/keygen.c:1460
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (alleen versleutelen)\n"
-
-#: g10/keygen.c:1461
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (alleen versleutelen)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1465
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (eigen mogelijkheden instellen)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (eigen mogelijkheden instellen)\n"
 
-#: g10/keygen.c:1534
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA sleutelpaar krijgt %u bits.\n"
-
-#: g10/keygen.c:1544
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s sleutels moeten tussen %u en %u bits lang zijn.\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Welke sleutellengte wilt u? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welke sleutellengte wilt u? (%u) "
 
-#: g10/keygen.c:1565
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n"
-
-#: g10/keygen.c:1571
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:1576 g10/keygen.c:1581
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "afgerond naar %u bits\n"
-
-#: g10/keygen.c:1648
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4021,7 +4134,7 @@ msgstr ""
 "      <n>m = sleutel verloopt na n maanden\n"
 "      <n>y = sleutel verloopt na n jaar\n"
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4037,38 +4150,38 @@ msgstr ""
 "      <n>m = ondertekening verloopt na n maanden\n"
 "      <n>y = ondertekening verloopt na n jaar\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Is de sleutel geldig voor? (0) "
 
-#: g10/keygen.c:1685
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Is de ondertekening geldig voor? (%s) "
 
-#: g10/keygen.c:1703 g10/keygen.c:1728
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt niet\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Ondertekening verloopt niet\n"
 
-#: g10/keygen.c:1716
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel is verlopen na %s\n"
 
-#: g10/keygen.c:1717
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ondertekening is verlopen na %s\n"
 
-#: g10/keygen.c:1721
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4076,12 +4189,12 @@ msgstr ""
 "Uw systeem kan geen datum weergeven na 2038.\n"
 "Het wordt echter wel juist afgehandeld tot 2106.\n"
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Is dit correct? (j/N) "
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4097,44 +4210,44 @@ msgstr ""
 "    “Henri Koot (Directeur van het cijfer) <HKoot@Singaradja.nl>”\n"
 "\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Werkelijke naam: "
 
-#: g10/keygen.c:1770
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in de naam\n"
 
-#: g10/keygen.c:1772
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet met een cijfer beginnen\n"
 
-#: g10/keygen.c:1774
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet minimaal 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Email adres: "
 
-#: g10/keygen.c:1788
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Geen geldig email adres\n"
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Opmerking: "
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in het commentaar\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U gebruikt de ‘%s’ tekenreeks.\n"
 
-#: g10/keygen.c:1831
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4145,7 +4258,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Plaats het email adres alstublieft niet in het Naam of Commentaar veld\n"
@@ -4161,23 +4274,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1852
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1862
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (S)toppen? "
 
-#: g10/keygen.c:1863
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (O)kay/(S)toppen? "
 
-#: g10/keygen.c:1882
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Verbeter eerst de fout\n"
 
-#: g10/keygen.c:1922
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4185,12 +4298,12 @@ msgstr ""
 "U moet een geheime zin opgeven om uw geheime sleutel te beschermen.\n"
 "\n"
 
-#: g10/keygen.c:1932 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:2011
 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"
@@ -4202,7 +4315,7 @@ msgstr ""
 "gebruik hiervoor de optie “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1960
+#: g10/keygen.c:2033
 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"
@@ -4213,50 +4326,50 @@ msgstr ""
 "nu even iets anders gaat doen op de computer (met de muis of harde schijf)\n"
 "terwijl dit gebeurd, hierdoor ontstaat meer gewenste willekeur.\n"
 
-#: g10/keygen.c:2823
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Het aanmaken van de sleutel is onderbroken.\n"
 
-#: g10/keygen.c:3023 g10/keygen.c:3172
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Publieke sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:3025 g10/keygen.c:3175
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "Geheime sleutel verwijzing wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3178
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheime sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:3161
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "geen schrijfbare publieke sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "geen schrijfbare geheime sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:3185
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "schrijven publieke sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:3192
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "schrijven geheime sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:3215
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "publieke en geheime sleutel zijn aangemaakt en ondertekened.\n"
 
-#: g10/keygen.c:3226
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4264,12 +4377,12 @@ msgstr ""
 "Deze sleutel kan niet gebruikt worden voor versleuteling. U kunt hiervoor\n"
 "met het commando “--edit-key” een subsleutel aanmaken.\n"
 
-#: g10/keygen.c:3238 g10/keygen.c:3367 g10/keygen.c:3482
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutel aanmaken is mislukt: %s\n"
 
-#: g10/keygen.c:3290 g10/keygen.c:3417 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4277,7 +4390,7 @@ msgstr ""
 "sleutel is %lu seconde in de toekomst gemaakt (tijd ruimte lus of problemen "
 "met de klok)\n"
 
-#: g10/keygen.c:3292 g10/keygen.c:3419 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4285,26 +4398,26 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijd ruimte lus of problemen "
 "met de klok)\n"
 
-#: g10/keygen.c:3301 g10/keygen.c:3430
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Noot: v3 subsleutels zijn niet toegestaan in de OpenPGP standaard\n"
 
-#: g10/keygen.c:3340 g10/keygen.c:3463
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Werkelijk aanmaken? (j/N) "
 
-#: g10/keygen.c:3628
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "sleutel is niet op de kaart opgeslagen: %s\n"
 
-#: g10/keygen.c:3675
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan reservebestand ‘%s’ niet maken: %s\n"
 
-#: g10/keygen.c:3701
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Noot: reserve bestand van de kaart sleutel opgeslagen als ‘%s’\n"
@@ -4391,195 +4504,195 @@ msgstr "Los dit beveiligingsprobleem alstublieft op\n"
 msgid "caching keyring `%s'\n"
 msgstr "inlezen sleutelring ‘%s’\n"
 
-#: g10/keyring.c:1435
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu sleutels tot nu toe ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1447
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu sleutels ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1518
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelring aangemaakt\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "toon ook ingetrokken sleutels"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "zoek ook op sub-sleutels als een sleutel ID wordt gezocht"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "gebruik tijdelijke bestanden om gegevens naar de sleutelsever te sturen"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "tijdelijke bestanden laten staan na gebruik"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "Sleutels automatische ophalen bij het controleren van ondertekeningen"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "gebruik de voorkeur sleutelserver zoals vermeld bij de sleutel"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "gebruik het de PKA informatie bij het ophalen van de sleutel"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "Waarschuwing: sleutelserver optie '%s' is niet geldig op dit platform\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Geef getallen, Volgende(N) , of Stoppen(Q) > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1434
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ongeldig sleutelserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "sleutel '%s' niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "sleutel niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:1153
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "opvragen sleutel %s van %s sleutelserver %s\n"
 
-#: g10/keyserver.c:1157
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "opvragen sleutel %s van %s\n"
 
-#: g10/keyserver.c:1181
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "namen zoeken van %s server %s\n"
 
-#: g10/keyserver.c:1184
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "namen zoeken van %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "versturen van sleutel %s naar %s server %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "versturen van sleutel %s naar %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zoeken naar '%s' van de %s server %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zoeken naar '%s' van de %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "geen sleutelserver actie!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "Waarschuwing: sleutelserver code is van een andere GnuPG versie (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "sleutelserver verstuurde geen versie informatie\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2035
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "er is geen sleutelserver bekend (gebruik commando --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externe sleutelservers zijn niet beschikbaar in deze versie\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "geen afhandeling mogelijk van sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "de actie ‘%s’ is niet ondersteund in de sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ondersteund de code met versie %d niet\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "sleutelserver reageert te langzaam\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "sleutelserver geeft een interne fout\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "communicatie fout met de sleutelserver: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” is geen sleutel ID: overgeslagen\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "Waarschuwing: het is niet mogelijk sleutel %s via %s te verversen: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 sleutel ververst vanuit %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d sleutels ververst vanuit %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Waarschuwing: het is niet mogelijk de URI %s te benaderen: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Waarschuwing: leesfout in URI %s\n"
@@ -4762,7 +4875,7 @@ msgstr "binair"
 msgid "textmode"
 msgstr "tekst"
 
-#: g10/mainproc.c:1917 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "onbekend"
 
@@ -4833,59 +4946,64 @@ msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "Waarschuwing: U gebruikt een expirimenteel samenvattings algoritme %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "het IDEA versleutelalgoritme is niet beschikbaar\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "lees %s voor meer informatie\n"
 
-#: g10/misc.c:715
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "Noot: %s is niet beschikbaar in deze versie\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: afgeraden optie “%s”\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Waarschuwing: “%s” is een afgeraden optie\n"
 
-#: g10/misc.c:721
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "U kunt beter “%s%s” gebruiken\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "Waarschuwing: “%s” is een afgeraden comando - gebruik het niet\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Ongecomprimeerd"
 
-#: g10/misc.c:766
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "ongecomprimeerd|geen"
 
-#: g10/misc.c:893
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "dit bericht kan mogelijk niet gebruikt worden door %s\n"
 
-#: g10/misc.c:1068
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "dubbelzinnige optie ‘%s’\n"
 
-#: g10/misc.c:1093
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "onbekende optie ‘%s’\n"
@@ -5082,23 +5200,23 @@ msgstr "geen programma geslecteerd om de foto te tonen\n"
 msgid "unable to display photo ID!\n"
 msgstr "het is niet mogelijk de foto ID te tonen!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Geen reden opgegeven"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Sleutel is vervangen"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Sleutel is niet meer te vertrouwen"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Sleutel is niet meer in gebruik"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Gebruiker ID is niet meer geldig"
 
@@ -5166,7 +5284,7 @@ msgstr ""
 "Het minimale vertrouwensniveau voor deze sleutel is: %s\n"
 "\n"
 
-#: g10/pkclist.c:301 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Uw keuze? "
 
@@ -5418,7 +5536,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTE: key has been revoked"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
@@ -5441,11 +5559,11 @@ msgstr "(This is a sensitive revocation key)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Create a designated revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII versleutelde uitvoer geforceerd.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
@@ -5464,29 +5582,29 @@ msgstr "no revocation keys found for “%s”\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no corresponding public key: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "public key does not match secret key!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Create a revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "unknown protection algorithm\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: This key is not protected!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5504,33 +5622,33 @@ msgstr ""
 "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"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Cancel"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(No description given)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Is this okay? (j/N) "
@@ -5633,17 +5751,17 @@ msgstr ""
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: signature key %s expired %s\n"
 
-#: g10/sig-check.c:323
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:581
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:607
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
@@ -5903,9 +6021,10 @@ msgstr "%s: failed to zero a record: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1503
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
+#: g10/tdbio.c:1502
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: trustdb created\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5952,127 +6071,135 @@ msgstr "trust record %lu, req type %d: read failed: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ revoked]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ expired]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[ unknown]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[  undef ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[  full  ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[ultimate]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "undefined"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "never"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "full"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "ultimate"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2447
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2190
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2255
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2269
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2292
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2378
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2453
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -6391,6 +6518,15 @@ msgstr "operation is not possible without initialized secure memory\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(you may have used the wrong program for this task)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA sleutelpaar krijgt %u bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Beheerders PIN"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "can't put notation data into v3 (PGP 2.x style) signatures\n"
 
diff --git a/po/pl.po b/po/pl.po
index 88059d542..212f0b735 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.8\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2007-12-12 18:41+0100\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -50,13 +50,12 @@ msgstr "nie mo
 msgid "waiting for lock on `%s'...\n"
 msgstr "oczekiwanie na blokad� ,,%s''...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -89,9 +88,10 @@ msgstr "nie mo
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -151,174 +151,220 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie mo�na zapisa� odcisku: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie mo�na zapisa� daty utworzenia: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "nie mo�na odczyta� klucza publicznego: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "odpowied� nie zawiera klucza publicznego\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowied� nie zawiera wsp�czynnik�w RSA\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego eksponentu RSA\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Prosz� poda� PIN%%0A[podpisano: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Prosz� poda� PIN%%0A[podpisano: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "wywo�anie zwrotne PIN zwr�ci�o b��d: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN CHV%d zbyt kr�tki; minimalna d�ugo�� to %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "sprawdzenie CHV%d nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "dost�p do komend administracyjnych nie jest skonfigurowany\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d przy pobieraniu statusu CHV z karty\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "karta jest nieodwracalnie zablokowana!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "pozosta�o %d pr�b(y/a) wprowadzenia PIN-u administracyjnego przed\n"
 "nieodwracaln� blokad� karty\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|PIN administracyjny"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Prosz� poda� PIN%%0A[podpisano: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Prosz� poda� PIN%%0A[podpisano: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "dost�p do komend administracyjnych nie jest skonfigurowany\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "klucz publiczny jest ju� niedost�pny"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN CHV%d zbyt kr�tki; minimalna d�ugo�� to %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administracyjny"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas pobierania PIN: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "b��d odczytu danych aplikacji karty: %s\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "b��d odczytu DO odcisku\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "tworzenie nowego klucza\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "tworzenie nowego klucza\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr "brak znacznika czasu utworzenia\n"
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "brak wsp�czynnika RSA lub nie jest d�ugo�ci %d bit�w\n"
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "brak publicznego eksponentu RSA lub jest d�u�szy niz %d bit�w\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "brak liczby pierwszej %s dla RSA, lub nie jest d�ugo�ci %d bit�w\n"
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "zapis klucza nie powi�d� sie: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "prosze czeka� na stworzenie klucza...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "tworzenie klucza nie powiod�o si�\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "tworzenie klucza zako�czone (trwa�o %d s.)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "podpis�w z�o�onych do tej chwili: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Prosz� poda� PIN%%0A[podpisano: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "w tej chwili nie wolno sprawdzac PIN-u administracyjnego tym poleceniem\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie ma dost�pu do %s - niepoprawna karta OpenPGP?\n"
@@ -402,163 +448,225 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak karty w standardzie OpenPGP: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Karta OpenPGP numer %s\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[brak]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "m�czyzna"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "kobieta"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "bez odpowiedzi"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nie wymuszone"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "wymuszone"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "B��d: dozwolone s� tylko znaki z zestawu ASCII.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "B��d: nie mo�na u�yw� znaku ,,<''.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "B��d: podw�jne spacje s� niedozwolone.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Nazwisko w�a�ciciela karty: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Imi� w�a�ciciela karty: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "B��d: pe�ne dane (imi� + nazwisko) zbyt d�ugie (limit %d znak�w).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL �r�d�a klucza publicznego:"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Blad: URL zbyt d�ugi (maksymalnie %d znak�w).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "b��d tworzenia `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Dane do autoryzacji (nazwa konta): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "B��d: dane autoryzacyjne zbyt d�ugie (maksymalnie %d znak�w).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "B��d: prywatne dane DO zbyt d�ugie (maksymalnie %d znak�w).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Ustawienia j�zyka: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "B��d: niepoprawna d�ugo�� tekstu ustawie�,\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "B��d: niew�a�ciwe znaki w tek�cie ustawie�.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Plec: M - m�czyzna, F - kobieta, lub spacja: "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "B��d: niepopawna odpowied�.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza Centrum Certyfikacji: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "B��d: niew�a�ciwy format odcisku klucza.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "u�ycie klucza niemo�liwe: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "nie jest kart� OpenPGP"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d przy pobieraniu opisu klucza: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Zast�pi� istniej�cy klucz? (t/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "zaokr�glono do %u bit�w\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "Klucze %s mog� mie� d�ugo�� w zakresie %u-%u bit�w.\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "b��d odczytu bloku klucza tajnego ,,%s'': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Utworzy� poza kart� kopi� zapasow� klucza? (T/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "klucz tajny ju� jest zapisany na karcie\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Zast�pi� istniej�ce klucze? (t/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -569,177 +677,186 @@ msgstr ""
 "   PIN = ,,%s''     PIN administacyjny = ,,%s''\n"
 "Nale�y je zmieni� komend� --change--pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr ""
 "   (1) Klucz do podpisywania\n"
 "\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do autoryzacji\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony klucza\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "cz�ci tajne klucza s� niedost�pne\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "klucz tajny ju� jest zapisany na karcie\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "polecenia administracyjne"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "wszystkie dost�pne dane"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "zmiana nazwiska w�a�ciciela karty"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a klucza"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza z URL-a na karcie"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "zmiana nazwy konta"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "zmiana ustawie� j�zyka"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "zmiana p�ci w�a�ciciela karty"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku centrum certyfikacji"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "prze��czenie wymuszania PIN przy podpisywaniu"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "tworzenie nowych kluczy"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "menu zmiany lub odblokowania PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i okazanie wszystkich danych"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Polecenie dost�pne tylko w trybie administracyjnym\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia administracyjne s� dozwolone\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia administracyjne s� niedozwolone\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "czytnik niedost�pny\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Prosz� w�o�y� kart� do czytnika i nacisn�� ENTER,\n"
 "lub wprowadzi� ,,c'' aby anulowa� operacj�: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "wyb�r ustawie� openpgp nie powi�d� si�: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr "Prosz� zmieni� kart� w czytniku na kart� o numerze %.*s.\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Wci�nij ENTER kiedy karta jest gotowa, lub podaj ,,c'' aby anulowa�: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Wprowad� nowy PIN administracyjny: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Wprowad� nowy PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Wprowad� PIN administracyjny: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Wprowad� PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Powt�rz PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nie zosta� poprawnie powt�rzony; jeszcze jedna pr�ba"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -748,13 +865,13 @@ msgstr "nie mo
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -857,7 +974,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
@@ -1247,7 +1364,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -1255,7 +1372,7 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Kompresji: "
 
@@ -1401,404 +1518,404 @@ msgstr "pokazywanie dat wyga
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie za�adowany z powodu niebezpiecznych praw dost�pu\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawn� dat� wygasania wa�no�ci podpisu\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje listy kluczy\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje listy kluczy\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "okazywanie zdj�� podczas sprawdzania podpisu"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "okazywanie URL-i do regulamin�w podczas sprawdzania podpisu"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie adnotacji standardu IETF przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "pokazywanie URL-i wybranych serwer�w kluczy"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poziom�w zaufania przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "okazywanie uniewa�nionych i wygas�ych identyfikator�w przy sprawdzaniu "
 "podpisu"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego identyfikatora przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z u�yciem danych PKA"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "podnoszenie zaufania do podpis�w na podstawie danych PKA"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "UWAGA: %s nie jest dost�pny w tej wersji\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "z powodu %s nie b�dzie wykonane w niezabezpieczonej pami�ci\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: ,,%s'': %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "w trybie --s2k-mode 0 nie mo�na u�y� --symmetric --encrypt\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "w trybie %s nie mo�esz u�y� --symmetric --encrypt\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "w trybie --s2k-mode 0 nie mo�esz u�y� --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "w trybie %s nie mo�esz u�y� --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
@@ -1843,17 +1960,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - zignorowany\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -1879,8 +1996,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
@@ -2678,12 +2796,12 @@ msgstr "b
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "blok klucza ,,%s'': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
@@ -2733,7 +2851,7 @@ msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2744,12 +2862,12 @@ msgstr ""
 "to�samo�ci innych u�ytkownik�w (czy sprawdzi on odciski kluczy pobrane\n"
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
@@ -2969,8 +3087,8 @@ msgstr "To
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -2981,19 +3099,19 @@ msgstr ""
 "Atrapa klucza, lub szkielet klucza z karty - brak has�a kt�re mo�naby "
 "zmieni�.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�ci tajne g��wnego znajduj� si� na karcie.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3010,7 +3128,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -3330,113 +3448,113 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? (t/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Klucz nie b�dzie modyfikowany na serwerze"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Domy�lny serwer kluczy: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz zosta� uniewa�niony %s przez %s kluczem %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s %s"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "utworzony: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "uniewa�niony: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "wykorzystanie: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "wiarygodno��: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "numer karty: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3444,17 +3562,17 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "uniewa�niony"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "wygas�y"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3463,7 +3581,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3472,74 +3590,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� upakowany %s\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis usuni�ty\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' %d podpisy(�w) usuni�te(ych)\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� jest upakowany\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': jest ju� oczyszczony\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3549,254 +3667,255 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "klucz zosta� ju� ustawiony jako uniewa�niaj�cy\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie s�u�y do podpisywania, wi�c nie trzeba go podpisywac "
 "skro�nie\n"
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj URL preferowanego serwera kluczy: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usun��? (t/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "Kontynuowa�? (t/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika ze skr�tem %s\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika ,,%s''\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany Twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory klucza %s s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (podpis nieuniewa�nialny) "
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %s w %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz %s (id %d).\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %s powtarza si�\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele ustawie� szyfr�w\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele ustawie� skr�t�w\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele ustawie� kompresji\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niepoprawny napis ,,%s'' w tek�cie ustawie�\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Po�wiadczanie"
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autoryzacja"
 
@@ -3809,109 +3928,104 @@ msgstr "Autoryzacja"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "PpSsAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mo�liwe wykorzystanie klucza %s: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Dozwolone dzia�ania: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci podpisywania\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci szyfrowania\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci autoryzacji\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Koniec\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (z dowolnie wybranymi funkcjami)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (z dowolnie wybranymi funkcjami)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (z dowolnie wybranymi funkcjami)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Para kluczy dla DSA b�dzie mia�a %u bity/�w d�ugo�ci.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Klucze %s mog� mie� d�ugo�� od %u do %u bit�w.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "Klucze %s mog� mie� d�ugo�� w zakresie %u-%u bit�w.\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "zaokr�glono do %u bit�w\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3927,7 +4041,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3943,38 +4057,38 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Klucz bez daty wygasania\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Podpis bez daty wygasania\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz wygasa %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3982,11 +4096,11 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza? (t/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4002,44 +4116,44 @@ msgstr ""
 "    ,,Tadeusz �ele�ski (Boy) <tzb@ziemianska.pl>''\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4050,7 +4164,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4067,37 +4181,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4109,7 +4223,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4125,50 +4239,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� szkielet klucza tajnego w ,,%s''\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4176,12 +4290,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4189,7 +4303,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4197,26 +4311,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? (t/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� kopii zapasowej ,,%s'': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: kopia klucza z karty zosta�a zapisana w ,,%s''\n"
@@ -4249,250 +4363,250 @@ msgstr "Adnotacje podpisu: "
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      Odcisk klucza ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "Numer seryjny karty ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "buforowanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy zbuforowanych (%lu podpis�w)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy zbuforowano (%lu podpis�w)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "w��czenie uniewa�nionych kluczy do wynik�w wyszukiwania"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "uwzgl�dnienie podkluczy do wyszukiwania po numerze klucza"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "wykorzystanie plik�w tymczasowych do komunikacji z programami pomocniczymi"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "bez kasowania plik�w tymczasowych po u�yciu"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "automatyczne pobieranie brakuj�cych kluczy przy sprawdzaniu podpis�w"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "uwzgldnienie ustawienia serwera kluczy na kluczu przy jego pobieraniu"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "uwzgl�dnienie ustawienia PKA na kluczu przy jego pobieraniu"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcja serwera ,,%s'' nie dzia�a na tym systemie\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "wy��czone"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Podaj numer opcji, (N)Dalej, lub (Q)Wyjscie > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawny protok� dost�pu do serwera kluczy (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "brak klucza ,,%s'' w serwerze\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "brak klucza w serwerze\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %s w serwerze %s %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s w %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "szukanie nazw w serwerze %s %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "szukanie nazw w serwerze %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "wysy�anie klucza %s do serwera %s %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysy�anie klucza %s do %s\"\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze %s %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "brak polecenia dla serwera kluczy!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "OSTRZE�ENIE: program obs�ugi serwera kluczy pochodzi z innej wersji GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "serwer kluczy nie wys�a� VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "ta kompilacja nie obs�uguje zewn�trznych proigram�w do komunikacji z "
 "serwerami\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "brak programu obs�uguj�cego protok� ,,%s''\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "nie mo�na zrobi� ,,%s'' przy po��czeniu protoko�em ,,%s''\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nie obs�uguje programu pomocniczego w wersji %d\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "przekroczenie limitu czasu po��czenia z serwerem kluczy\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "b��d ��czno�ci z serwerem kluczy: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s nie jest poprawnym identyfikatorem klucza, pomini�ty\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: od�wie�y� klucza %s przez %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "od�wie�anie klucza z %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "od�wie�anie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: niezrozumia�y URI %s\n"
@@ -4645,63 +4759,63 @@ msgstr "Poprawny podpis z
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      \\alias ,,%s''"
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -4740,59 +4854,64 @@ msgstr "OSTRZE
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "OSTRZE�ENIE: u�ywany jest eksperymentalny algorytm skr�tu %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest przestarza�y\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "wi�cej informacji mo�na znale�� w %s\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest przestarza�y\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "UWAGA: %s nie jest dost�pny w tej wersji\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� -- nie nale�y jej u�ywa�\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "Nieskompresowany|brak"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
@@ -4844,13 +4963,13 @@ msgstr "katalog ,,%s'' utworzony\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -4936,7 +5055,7 @@ msgstr "         (podklucz na kluczu g
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4950,58 +5069,58 @@ msgstr ""
 "publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
 "Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nie mo�na otworzy� pliku JPEG ,,%s'': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bardzo du�y plik JPEG (%d bajt�w)!\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz go u�y�? (t/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr "brak ustawienia przegl�darki do zdj��\n"
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nie podano przyczyny"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Klucz zosta� zast�piony"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Identyfikator u�ytkownika przesta� by� poprawny"
 
@@ -5021,44 +5140,44 @@ msgstr "iImMwWpP"
 msgid "No trust value assigned to:\n"
 msgstr "Brak warto�ci zaufania dla:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "      alias ,,%s''\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Jak bardzo ufasz, �e ten klucz nale�y do tej osoby?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = nie wiem, albo nie powiem\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NIE ufam mu\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr " m = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr " p = pomini�cie klucza\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5067,37 +5186,37 @@ msgstr ""
 "Minimalny poziom zaufania do tego klucza wynosi %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Czy na pewno chcesz obdarzy� ten klucz absolutnym zaufaniem? (t/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Jest ograniczona pewno�� co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5107,111 +5226,111 @@ msgstr ""
 "Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�* wiesz co robisz,\n"
 "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "U�y� tego klucza pomimo to? (t/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZE�ENIE: ten klucz m�g� zosta� uniewa�niony\n"
 "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Uwaga: sprawdzony adres sygnatariusza to ,,%s''\n"
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Uwaga: adres sygnatariusza ,,%s'' nie zgadza si� z DNS\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "poziom zaufania zmieniony na PE�EN z powodu poprawnego PKA\n"
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "poziom zaufania zmieniony na NIGDY z powodu niepoprawnego PKA\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: wa�no�� tego klucza wygas�a!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Obecnie wybrani adresaci:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5219,33 +5338,33 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
@@ -5313,7 +5432,7 @@ msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
@@ -5335,11 +5454,11 @@ msgstr "(to jest czu
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
@@ -5358,28 +5477,28 @@ msgstr "brak kluczy uniewa
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Utworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5403,33 +5522,33 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? (t/N) "
 
@@ -5507,17 +5626,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZE�ENIE: podklucz podpisuj�cy %s jest niepoprawnie skro�nie podpisany\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny %s jest o %lu sekund(y) m�odszy od podpisu\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5525,7 +5644,7 @@ msgstr ""
 "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5533,24 +5652,24 @@ msgstr ""
 "klucz %s zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %s przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "podpis z�o�ony kluczem %s uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %s: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %s: brak podklucza dowi�zywanego podpisem\n"
@@ -5690,12 +5809,12 @@ msgstr "b
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -5739,85 +5858,85 @@ msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: baza zaufania utworzona\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5864,120 +5983,128 @@ msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "nie mo�na u�y� nieznanego modelu zaufania %d, zostaje przyj�ty %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "model zaufania %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "16"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ uniewa�niony  ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ wygas�y       ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[ nieznany      ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[niezdefiniowany]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[ marginalny    ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ pe�ny         ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[ ostateczny    ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "niezdefiniowany"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "nigdy"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginalny"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "pe�ny"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "ostateczny"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne przy modelu ,,%s''\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "aktualizacja bazy jest niepotrzebna przy modelu ,,%s''\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %s nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "potrzeba %d marginalny(ch), %d zupe�ny(ch), model zaufania %s\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5985,7 +6112,7 @@ msgstr ""
 "g��boko��: %d wa�nych: %3d podpisanych %3d zaufanych %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "zapis aktualizacji bazy zaufania nie powi�d� si�: %s\n"
@@ -6244,47 +6371,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "wW"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "ok|OK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "anuluj|Anuluj"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "aA"
 
@@ -6304,6 +6431,16 @@ msgstr "bez zabezpieczenia pami
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Para kluczy dla DSA b�dzie mia�a %u bity/�w d�ugo�ci.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN administracyjny"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
@@ -7465,9 +7602,6 @@ msgstr "(prawdopodobnie u
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "nie mo�na zablokowa� zbioru kluczy publicznych: %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "b��d zapisu zbioru kluczy '%': %s\n"
-
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "UWAGA: wpis podpisu %lu[%d] znajduje si� w li�cie domy�lnej %lu,\n"
@@ -7505,9 +7639,6 @@ msgstr "(prawdopodobnie u
 #~ msgid "Too many preference items"
 #~ msgstr "Zbyt wiele pozycji w ustawieniach"
 
-#~ msgid "public key not anymore available"
-#~ msgstr "klucz publiczny jest ju� niedost�pny"
-
 #~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 #~ msgstr ""
 #~ "identyfikator %08lX.%lu/%02X%02X: ma zdublowany katalog %lu,\n"
diff --git a/po/pt.po b/po/pt.po
index 18a3ff3c0..aa9584bb1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -41,13 +41,12 @@ msgstr "imposs
 msgid "waiting for lock on `%s'...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -80,9 +79,10 @@ msgstr "imposs
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -133,176 +133,220 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "A gera��o de chaves falhou: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "erro na leitura do bloco de chave: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro ao ler registo livre: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "%s' j� comprimido\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "gerar um novo par de chaves"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A gera��o de chaves falhou: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "assinatura %s de: \"%s\"\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "partes da chave secreta n�o dispon�veis\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "motivo da revoca��o: "
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro na leitura do bloco de chave: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler registo livre: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%s' j� comprimido\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -389,176 +433,238 @@ msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Este comando n�o � permitido no modo %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro ao criar `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arredondado para %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -566,192 +672,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -760,13 +875,13 @@ msgstr "imposs
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -871,7 +986,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
@@ -1271,7 +1386,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1279,7 +1394,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compress�o: "
 
@@ -1416,415 +1531,415 @@ msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
@@ -1870,17 +1985,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -1912,7 +2027,7 @@ msgstr "Uso: gpg [op
 
 #: g10/gpgv.c:102
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
@@ -2707,12 +2822,12 @@ msgstr "erro ao criar porta-chaves `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
@@ -2761,7 +2876,7 @@ msgstr "1 ID de utilizador sem auto-assinatura v
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2774,12 +2889,12 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
@@ -3018,8 +3133,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3028,20 +3143,20 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3058,7 +3173,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -3404,117 +3519,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3522,25 +3637,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3549,76 +3664,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3627,266 +3742,267 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3899,109 +4015,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (apenas cifragem)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (apenas cifragem)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas cifragem)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (apenas cifragem)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "arredondado para %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4017,7 +4128,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4033,40 +4144,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4074,12 +4185,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4097,44 +4208,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4145,7 +4256,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4162,23 +4273,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4186,12 +4297,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4203,7 +4314,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4215,50 +4326,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4267,12 +4378,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4280,7 +4391,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4288,26 +4399,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4340,254 +4451,254 @@ msgstr "Nota
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -4743,65 +4854,65 @@ msgstr "Assinatura correcta de \""
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4842,63 +4953,68 @@ msgstr "algoritmo de criptografia n
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = mostrar mais informa��es\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = mostrar mais informa��es\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -4951,11 +5067,11 @@ msgstr "%s: directoria criada\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5045,7 +5161,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5054,61 +5170,61 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
@@ -5131,89 +5247,89 @@ msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = N�o sei\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Eu N�O confio\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = saltar esta chave\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Decis�o? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5225,113 +5341,113 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5339,33 +5455,33 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -5432,7 +5548,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
@@ -5455,11 +5571,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
@@ -5479,31 +5595,31 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5514,37 +5630,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
@@ -5621,17 +5737,17 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5639,7 +5755,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5647,24 +5763,24 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
 "desconhecido\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
@@ -5805,12 +5921,12 @@ msgstr "armadura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -5854,86 +5970,85 @@ msgstr "%s: base de dados de confian
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"A base de dados de confian�a est� danificada; por favor execute\n"
-"\"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: base de dados de confian�a criada\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5982,132 +6097,140 @@ msgstr "registo de confian
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6369,48 +6492,48 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6431,6 +6554,15 @@ msgstr "a opera
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ter� 1024 bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "A base de dados de confian�a est� danificada; por favor execute\n"
+#~ "\"gpg --fix-trustdb\".\n"
+
 #, fuzzy
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 510d559a9..20ae4c328 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2007-10-23 11:33+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -45,13 +45,12 @@ msgstr "imposs
 msgid "waiting for lock on `%s'...\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -84,9 +83,10 @@ msgstr "imposs
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -138,176 +138,221 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "A gera��o de chaves falhou: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro lendo registro livre: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "%lu chaves processadas\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "gerar um novo par de chaves"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A gera��o de chaves falhou: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "assinatura %s de: %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "Digite o identificador de usu�rio: "
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "a chave p�blica n�o est� mais dispon�vel"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "rev- revoga��es de chaves incorreta\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro lendo registro livre: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%lu chaves processadas\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -394,177 +439,238 @@ msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+msgid "This command is only available for version 2 cards\n"
+msgstr ""
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arredondado para %u bits\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
+#: g10/card-util.c:1378
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -572,196 +678,205 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "erro na escrita do chaveiro `%': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -770,13 +885,13 @@ msgstr "imposs
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -876,7 +991,7 @@ msgstr "NOTA: algoritmo de criptografia %d n
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -1281,7 +1396,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr ""
 
@@ -1289,7 +1404,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
@@ -1427,420 +1542,420 @@ msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "a URL de pol�tica dada � inv�lida\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "a URL de pol�tica dada � inv�lida\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
@@ -1888,17 +2003,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -1931,7 +2046,7 @@ msgstr "Uso: gpg [op
 #: g10/gpgv.c:102
 #, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
@@ -2667,12 +2782,12 @@ msgstr "erro na escrita do chaveiro `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
@@ -2721,7 +2836,7 @@ msgstr "1 ID de usu
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2740,12 +2855,12 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
@@ -2964,8 +3079,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2974,21 +3089,21 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3005,7 +3120,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -3351,489 +3466,490 @@ msgstr "Realmente remover todos os IDs de usu
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3846,109 +3962,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (padr�o)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) ElGamal (apenas criptografia)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (apenas criptografia)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1502
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "arredondado para %u bits\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3964,7 +4075,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3981,40 +4092,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4022,12 +4133,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4044,44 +4155,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4092,7 +4203,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4107,24 +4218,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4132,12 +4243,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4149,7 +4260,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4161,50 +4272,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4213,12 +4324,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4226,7 +4337,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4234,26 +4345,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4290,258 +4401,258 @@ msgstr "Nota
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
@@ -4698,64 +4809,64 @@ msgstr "Assinatura correta de \""
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4794,61 +4905,66 @@ msgstr "algoritmo de criptografia n
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:353
-#, fuzzy, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#: g10/misc.c:748
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -4901,11 +5017,11 @@ msgstr "%s: diret
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -4996,7 +5112,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5005,63 +5121,63 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -5086,87 +5202,87 @@ msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5178,148 +5294,148 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -5388,7 +5504,7 @@ msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
@@ -5411,11 +5527,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
@@ -5435,32 +5551,32 @@ msgstr ""
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5471,34 +5587,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
@@ -5576,17 +5692,17 @@ msgstr ""
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5594,7 +5710,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5602,22 +5718,22 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
@@ -5754,12 +5870,12 @@ msgstr "erro de leitura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
@@ -5803,86 +5919,85 @@ msgstr "%s: banco de dados de confiabilidade inv
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"O banco de dados de confiabilidade est� danificado; por favor rode\n"
-"\"gpg --fix-trust-db\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: banco de dados de confiabilidade criado\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5930,132 +6045,140 @@ msgstr "registro de confian
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6320,49 +6443,49 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6384,6 +6507,15 @@ msgstr "a opera
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ter� 1024 bits.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "O banco de dados de confiabilidade est� danificado; por favor rode\n"
+#~ "\"gpg --fix-trust-db\".\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
@@ -7467,9 +7599,6 @@ msgstr "(voc
 #~ msgid "Too many preference items"
 #~ msgstr "Muitos itens de prefer�ncia"
 
-#~ msgid "public key not anymore available"
-#~ msgstr "a chave p�blica n�o est� mais dispon�vel"
-
 # trauzir sombra ???
 #~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 #~ msgstr ""
@@ -7503,9 +7632,6 @@ msgstr "(voc
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "imposs�vel bloquear chaveiro `%': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "erro na escrita do chaveiro `%': %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escrevendo bloco de chaves\n"
 
diff --git a/po/ro.po b/po/ro.po
index a73b18eb1..4e81faa32 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -42,13 +42,12 @@ msgstr "nu pot 
 msgid "waiting for lock on `%s'...\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -82,9 +81,10 @@ msgstr "nu pot citi `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -140,172 +140,218 @@ msgstr ""
 "a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
 "(Mai sunt necesari %d octe�i)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "apelul PIN a returnat eroare: %s\n"
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "verificarea CHV%d a e�uat: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "accesul la comenzile de administrare nu este configurat�\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "eroare la recuperarea st�rii CHV de pe card\n"
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "cardul este �ncuiat permanent!\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Admin"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|PIN Admin Nou"
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "|N|PIN Nou"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eroare la ob�inere noului PIN: %s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "eroare la citirea datelor aplica�iei\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "eroare la citirea amprentei DO\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "cheia exist� deja\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "cheia existent� va fi �nlocuit�\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "generez o nou� cheie\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "timestamp-ul de creare lipse�te\n"
-
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
-
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "am e�uat s� stochez cheia: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "generarea cheii a e�uat\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "generarea cheii este complet� (%d secunde)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "semn�turi create p�n� acum: %lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "apelul PIN a returnat eroare: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verificarea CHV%d a e�uat: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "eroare la recuperarea st�rii CHV de pe card\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "cardul este �ncuiat permanent!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "accesul la comenzile de administrare nu este configurat�\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|PIN Admin Nou"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|PIN Nou"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eroare la ob�inere noului PIN: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "eroare la citirea datelor aplica�iei\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "eroare la citirea amprentei DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "cheia exist� deja\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "cheia existent� va fi �nlocuit�\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "generez o nou� cheie\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "generez o nou� cheie\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "timestamp-ul de creare lipse�te\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
+
+#: g10/app-openpgp.c:2652
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "generarea cheii a e�uat\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "generarea cheii este complet� (%d secunde)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "semn�turi create p�n� acum: %lu\n"
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -390,163 +436,225 @@ msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rotunjit� prin adaos la %u bi�i\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "eroare la citire keyblock secret \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "cheia secret� deja stocat� pe un card\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -557,140 +665,149 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "cheia secret� nu e disponibil�"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
 "renun�a: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -699,36 +816,36 @@ msgstr ""
 "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -737,13 +854,13 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -847,7 +964,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
@@ -1242,7 +1359,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -1250,7 +1367,7 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Compresie: "
 
@@ -1403,411 +1520,411 @@ msgstr "Nici o semn
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
@@ -1851,17 +1968,17 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -1887,8 +2004,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
@@ -2699,12 +2817,12 @@ msgstr "eroare la crearea inelului de chei `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "resurs� keyblock `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
@@ -2753,7 +2871,7 @@ msgstr "am g
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2764,12 +2882,12 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
@@ -2988,8 +3106,8 @@ msgstr "Am verificat aceast
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3000,19 +3118,19 @@ msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3029,7 +3147,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -3349,114 +3467,114 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3465,17 +3583,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3484,7 +3602,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3493,74 +3611,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3570,258 +3688,259 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autentific�"
 
@@ -3834,109 +3953,104 @@ msgstr "Autentific
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA �i Elgamal (implicit)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (numai cifrare)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (numai cifrare)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Perechea de chei DSA va avea %u bi�i.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "rotunjit� prin adaos la %u bi�i\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3952,7 +4066,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3968,38 +4082,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4007,11 +4121,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4028,44 +4142,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4076,7 +4190,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4091,23 +4205,23 @@ msgstr "V
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4115,12 +4229,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4131,7 +4245,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4143,50 +4257,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4196,12 +4310,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4209,7 +4323,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4217,25 +4331,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
@@ -4268,251 +4382,251 @@ msgstr "Notare semn
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -4666,63 +4780,63 @@ msgstr "Semn
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -4761,60 +4875,65 @@ msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -4867,13 +4986,13 @@ msgstr "director `%s' creat\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -4961,7 +5080,7 @@ msgstr "         (subcheie pe cheia principal
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4977,58 +5096,58 @@ msgstr ""
 "foarte larg�!\n"
 "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fi�ier JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este aceast� poz� corect� (d/N/t)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
@@ -5048,46 +5167,46 @@ msgstr "iImMtTsS"
 msgid "No trust value assigned to:\n"
 msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
 "numit?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = NU am �ncredere\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Am �ncredere suprem�\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = �napoi la meniul principal\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  t = termin�\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5096,42 +5215,42 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Aceast� cheie ne apar�ine\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5141,111 +5260,111 @@ msgstr ""
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
 "r�spunde cu da la urm�toarea �ntrebare.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5253,33 +5372,33 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
@@ -5349,7 +5468,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
@@ -5371,11 +5490,11 @@ msgstr "(Aceasta este o cheie de revocare senzitiv
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
@@ -5394,28 +5513,28 @@ msgstr "nici o cheie de revocare g
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5433,33 +5552,33 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
@@ -5537,17 +5656,17 @@ msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5555,7 +5674,7 @@ msgstr ""
 "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5563,24 +5682,24 @@ msgstr ""
 "cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
@@ -5717,12 +5836,12 @@ msgstr "eroare citire 
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
@@ -5766,84 +5885,85 @@ msgstr "%s: a fost creat trustdb invalid\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: a fost creat trustdb\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5890,129 +6010,137 @@ msgstr "
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6273,47 +6401,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "da"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "dD"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nu"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "termin�"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "OK|OK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "renun��|renun��"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6334,6 +6462,15 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Perechea de chei DSA va avea %u bi�i.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN Admin"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
 
diff --git a/po/ru.po b/po/ru.po
index cba666e79..76f6e7e2d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <maxbritov@tut.by>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -40,13 +40,12 @@ msgstr "невозможно заблокировать `%s'\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -78,9 +77,10 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -135,173 +135,219 @@ msgstr ""
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
 "чтобы ОС могла получить больше случайных данных! (Необходимо ещё %d байт)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой при чтении ключа: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "доступ к командам управления не настроен\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Административный PID"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "доступ к командам управления не настроен\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "секретная часть ключ не доступна\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Укажите причину отзыва:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "генерация нового ключа\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Введите PIN%%0A[подписей: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -386,163 +432,225 @@ msgstr ""
 "символы quoted printable в кодировке ASCII - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Данная команда не допустима в режиме %s.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка:Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Имя влдаельца карты:"
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "ошибка создания `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Какой размер ключа Вам необходим? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Какой размер ключа Вам необходим? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Какой размер ключа Вам необходим? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "округлен до %u бит\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "размер ключей %s должен быть в пределах %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "секретный ключ уже сохранен в карте\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -553,140 +661,149 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Вы должны изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "ошибка записи таблицы ключей `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 #, fuzzy
 msgid "toggle the signature force PIN flag"
 msgstr "переключение флага force PIN"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 #, fuzzy
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN  и показать все данные"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "секретный ключ не найден"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -695,36 +812,36 @@ msgstr ""
 "Извлеките текущую карту и вставьте карту с серийным номером:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Введите новый Admin PIN: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Введите новый PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Введите Admin PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Введите PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Повторите ввод PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -733,13 +850,13 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -836,7 +953,7 @@ msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) наруша
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
@@ -1229,7 +1346,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
@@ -1237,7 +1354,7 @@ msgstr "Симметричные шифры: "
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
@@ -1383,411 +1500,411 @@ msgstr "Нет соответствующей подписи в связке с
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "`%s' недопустимый срок действия подписи\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "`%s' недопустимый срок действия подписи\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
 # test it
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
@@ -1833,17 +1950,17 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
@@ -1869,8 +1986,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
@@ -2670,12 +2788,12 @@ msgstr "ошибка создания таблицы ключей `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
@@ -2724,7 +2842,7 @@ msgstr "обнаружен 1 User ID без действительной сам
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2736,12 +2854,12 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
@@ -2959,8 +3077,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -2969,19 +3087,19 @@ msgstr "не удалось подписать: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -2998,7 +3116,7 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
@@ -3311,46 +3429,46 @@ msgstr "Действительно обновить предпочтения д
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3358,71 +3476,71 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3430,18 +3548,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3449,7 +3567,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3458,74 +3576,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3534,253 +3652,254 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3793,109 +3912,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (с требуемыми возможностями)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (только для шифрования)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (только для шифрования)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (с требуемыми возможностями)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Какой размер ключа Вам необходим? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "размер ключей %s должен быть в пределах %u-%u\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "округлен до %u бит\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3911,7 +4025,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3927,38 +4041,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3966,11 +4080,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3985,44 +4099,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4033,7 +4147,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4048,24 +4162,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4073,12 +4187,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4090,7 +4204,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4102,50 +4216,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4153,45 +4267,45 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
@@ -4225,249 +4339,249 @@ msgstr "Примечание к подписи"
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
@@ -4621,63 +4735,63 @@ msgstr "Действительная подпись от \"%s\""
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
@@ -4720,60 +4834,65 @@ msgstr ""
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -4825,13 +4944,13 @@ msgstr "создан каталог `%s'\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -4915,7 +5034,7 @@ msgstr "         (подключ на главном ключе %s)"
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4929,58 +5048,58 @@ msgstr ""
 "с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
 "большое изображение. Рекомендуемый размер около 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя JPEG файла для Фото ID: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Не могу открыть JPEG файл `%s': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' - не JPEG файл\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Данное фото правильное (y/N/q)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
@@ -5000,47 +5119,47 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "Не задано значение доверия для:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
 # test it
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Насколько Вы уверены, что данный ключ принадлежит пользователю указанному в "
 "User ID ключа?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Не знаю или не буду отвечать\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Не доверяю\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Абсолютно доверяю\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr " m = вернуться в главное меню\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr " q = выход\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5049,22 +5168,22 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Вы действительно хотите установить АБСОЛЮТНОЕ доверие владельцу данного "
 "ключа? (y/N)"
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертификаты, приводящие к абсолютно доверяемому ключу:\n"
 
 # test it
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
@@ -5072,7 +5191,7 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
@@ -5080,15 +5199,15 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Этот ключ вероятно принадлежит названному владельцу\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Данный ключ принадлежит нам\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5098,106 +5217,106 @@ msgstr ""
 "в User ID ключа.  Если Вы ТОЧНО знаете, что Вы делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Все равно использовать данный ключ? (y/N)"
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ВНИМАНИЕ: возможно данный ключ отозван (ключ отзыва отсутвтует)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван ключом назначенным отзывающим!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже существует\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5205,33 +5324,33 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
@@ -5299,7 +5418,7 @@ msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -5322,11 +5441,11 @@ msgstr "(Это - sensitive ключ отзыва)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
@@ -5345,28 +5464,28 @@ msgstr "ключи отзыва для \"%s\" не найдены\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5385,33 +5504,33 @@ msgstr ""
 "носитель будет повреждён, но будьте осторожны: система печати\n"
 "Вашей машины может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
@@ -5488,17 +5607,17 @@ msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s имеет недостоверную перекрестную "
 "сертификацию\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5506,7 +5625,7 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5514,22 +5633,22 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "ЗАМЕТЬТЕ: подписавший ключ %s - просрочен %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
@@ -5666,12 +5785,12 @@ msgstr "ошибка чтения в `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -5715,84 +5834,85 @@ msgstr "%s: создана недействительная таблица до
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕТЬТЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: создана таблица доверий\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5839,125 +5959,133 @@ msgstr "запись о доверии %lu, тип запроса %d: сбой 
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
 
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
 # check it
-#: g10/trustdb.c:445
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
 # check it
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5965,7 +6093,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6226,47 +6354,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "да"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "нет"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr ""
 
@@ -6288,6 +6416,15 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Административный PID"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
diff --git a/po/sk.po b/po/sk.po
index 8f168ee95..34a9369d2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -37,13 +37,12 @@ msgstr "nemo
 msgid "waiting for lock on `%s'...\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -75,9 +74,10 @@ msgstr "nem
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -130,176 +130,220 @@ msgstr ""
 "Nedostatok n�hodn�ch bajtov. Pros�m, pracujte s opera�n�m syst�mom, aby\n"
 "ste mu umo�nili z�ska� viac entropie (je potrebn�ch %d bajtov).\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "nepodarilo posla� k��� na server: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr ""
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr ""
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr ""
-
 #: g10/app-openpgp.c:1494
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "chyba pri vytv�ran� hesla: %s\n"
-
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "chyba pri ��tan� bloku k���a: %s\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
-
-#: g10/app-openpgp.c:1560
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' je u� skomprimovan�\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1566
-#, fuzzy
-msgid "generating new key\n"
-msgstr "vytvori� nov� p�r k���ov"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1740
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "using default PIN as %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1825
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nem��em inicializova� datab�zu d�very: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1899
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
-
-#: g10/app-openpgp.c:1902
-#, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2085
-#, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s podpis, hashovac� algoritmus %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+msgid "||Please enter the PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "nepodarilo posla� k��� na server: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr ""
+
+#: g10/app-openpgp.c:1673
+msgid "|A|Please enter the Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "tajn� �asti k���a nie s� dostupn�\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:2065
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "chyba pri ��tan� bloku k���a: %s\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+
+#: g10/app-openpgp.c:2187
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' je u� skomprimovan�\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2193
+#, fuzzy
+msgid "generating new key\n"
+msgstr "vytvori� nov� p�r k���ov"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "vytvori� nov� p�r k���ov"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2766
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2865
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: g10/app-openpgp.c:2868
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -386,176 +430,238 @@ msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "chyba pri vytv�ran� `%s': %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "zaokr�hlen� na %u bitov\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,192 +669,201 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -757,13 +872,13 @@ msgstr "nemo
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -864,7 +979,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -1272,7 +1387,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "�ifry: "
 
@@ -1280,7 +1395,7 @@ msgstr "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Kompresia: "
 
@@ -1420,418 +1535,418 @@ msgstr "V s
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s nie je platn� znakov� sada\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "%s nie je platn� znakov� sada\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
@@ -1879,17 +1994,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
@@ -1915,8 +2030,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
@@ -2717,12 +2833,12 @@ msgstr "chyba pri vytv
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
@@ -2772,7 +2888,7 @@ msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2785,12 +2901,12 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
@@ -3031,8 +3147,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3041,20 +3157,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3071,7 +3187,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -3413,117 +3529,117 @@ msgstr "Skuto
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3531,19 +3647,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3551,7 +3667,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3560,75 +3676,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3637,264 +3753,265 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr ""
 
@@ -3907,109 +4024,104 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1492
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1457
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (len na �ifrovanie)\n"
-
-#: g10/keygen.c:1459
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1507
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1533
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/keygen.c:1626
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "zaokr�hlen� na %u bitov\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4025,7 +4137,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4041,40 +4153,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4082,12 +4194,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 #, fuzzy
 msgid ""
 "\n"
@@ -4104,44 +4216,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4152,7 +4264,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4167,23 +4279,23 @@ msgstr "Do po
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4191,12 +4303,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4208,7 +4320,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4220,50 +4332,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4272,12 +4384,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4285,7 +4397,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4293,26 +4405,26 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
@@ -4345,254 +4457,254 @@ msgstr "Podpisov
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
@@ -4753,62 +4865,62 @@ msgstr "Dobr
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -4848,61 +4960,66 @@ msgstr "
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:353
+#: g10/misc.c:458
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA modul pre GnuPG nen�jden�\n"
+
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = pros�m o viac inform�c�i\n"
+
+#: g10/misc.c:475
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:459
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA modul pre GnuPG nen�jden�\n"
-
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:491
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = pros�m o viac inform�c�i\n"
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -4955,12 +5072,12 @@ msgstr "%s: adres
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5048,7 +5165,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5063,59 +5180,59 @@ msgstr ""
 "Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
 "obr�zka je okolo 240x288.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je s�bor JPEG\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
@@ -5138,89 +5255,89 @@ msgstr ""
 "Nie je priraden� �iadna hodnota d�very k:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Neviem\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�verujem\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�verujem absol�tne\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = sp� do hlavn�ho menu\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " u = ukon�i�\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5232,111 +5349,111 @@ msgstr ""
 "odpoveda� �no\n"
 "\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5344,33 +5461,33 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
@@ -5437,7 +5554,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
@@ -5460,11 +5577,11 @@ msgstr "(Toto je citliv
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
@@ -5483,29 +5600,29 @@ msgstr "
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5523,33 +5640,33 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
@@ -5626,17 +5743,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr��ov� certifik�ciu\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5644,7 +5761,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5652,24 +5769,24 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
 "kritick� bit\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
@@ -5817,12 +5934,12 @@ msgstr "chyba pri 
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
@@ -5866,84 +5983,85 @@ msgstr "%s: vytvoren
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: datab�za d�very vytvoren�\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5991,130 +6109,138 @@ msgstr "z
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6376,47 +6502,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "ukon�i�"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 #, fuzzy
 msgid "cC"
 msgstr "c"
@@ -6437,6 +6563,14 @@ msgstr "vykonanie oper
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
 
diff --git a/po/sv.po b/po/sv.po
index 45623036a..18a557477 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-07-20 14:32+0200\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2008-07-20 14:34+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -32,118 +32,91 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../cipher/primegen.c:119
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "kan inte generera primtal med pbits=%u qbits=%u\n"
 
-#: ../cipher/primegen.c:310
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan inte generera ett primtal med mindre än %d bitar\n"
 
-#: ../cipher/random.c:171
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "ingen entropi-insamlingsmodul identifierades\n"
 
 # se förra kommentaren
-#: ../cipher/random.c:401
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "kan inte låsa \"%s\": %s\n"
 
-#. Show the first message after ~2.25 seconds.
-#: ../cipher/random.c:406
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "väntar på lås på \"%s\"...\n"
 
-#: ../cipher/random.c:446
-#: ../g10/card-util.c:681
-#: ../g10/card-util.c:750
-#: ../g10/dearmor.c:59
-#: ../g10/dearmor.c:108
-#: ../g10/encode.c:182
-#: ../g10/encode.c:472
-#: ../g10/gpg.c:1015
-#: ../g10/gpg.c:3605
-#: ../g10/import.c:193
-#: ../g10/keygen.c:2403
-#: ../g10/keyring.c:1523
-#: ../g10/openfile.c:188
-#: ../g10/openfile.c:356
-#: ../g10/plaintext.c:490
-#: ../g10/sign.c:776
-#: ../g10/sign.c:969
-#: ../g10/sign.c:1083
-#: ../g10/sign.c:1234
-#: ../g10/tdbdump.c:139
-#: ../g10/tdbdump.c:147
-#: ../g10/tdbio.c:538
-#: ../g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: ../cipher/random.c:456
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: ../cipher/random.c:461
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte en vanlig fil - ignoreras\n"
 
-#: ../cipher/random.c:466
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "observera: filen random_seed är tom\n"
 
-#: ../cipher/random.c:472
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VARNING: ogiltig storlek på filen random_seed - används inte\n"
 
-#: ../cipher/random.c:480
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: ../cipher/random.c:518
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "observera: filen random_seed är inte uppdaterad\n"
 
-#: ../cipher/random.c:542
-#: ../g10/exec.c:479
-#: ../g10/gpg.c:1014
-#: ../g10/keygen.c:2889
-#: ../g10/keygen.c:2919
-#: ../g10/keyring.c:1199
-#: ../g10/keyring.c:1499
-#: ../g10/openfile.c:277
-#: ../g10/openfile.c:371
-#: ../g10/sign.c:794
-#: ../g10/sign.c:1099
-#: ../g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: ../cipher/random.c:554
-#: ../cipher/random.c:564
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva \"%s\": %s\n"
 
-#: ../cipher/random.c:567
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: ../cipher/random.c:812
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: ../cipher/random.c:813
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -157,7 +130,7 @@ msgstr ""
 "ANVÄND INTE DATA SOM GENERERATS AV DETTA PROGRAM!!\n"
 "\n"
 
-#: ../cipher/rndegd.c:200
+#: cipher/rndegd.c:200
 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"
@@ -167,7 +140,7 @@ msgstr ""
 "hjälper dig från att bli uttråkad, det förbättrar kvaliteten på\n"
 "insamlat entropidata.\n"
 
-#: ../cipher/rndlinux.c:130
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -179,453 +152,526 @@ msgstr ""
 "för att ge operativsystemet en chans att samla in mer entropidata!\n"
 "(behöver %d fler byte)\n"
 
-#: ../g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: ../g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: ../g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: ../g10/app-openpgp.c:983
-#: ../g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: ../g10/app-openpgp.c:991
-#: ../g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: ../g10/app-openpgp.c:1000
-#: ../g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: ../g10/app-openpgp.c:1256
-#: ../g10/app-openpgp.c:1344
-#: ../g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN-återanrop returnerade fel: %s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: ../g10/app-openpgp.c:1262
-#: ../g10/app-openpgp.c:1350
-#: ../g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: ../g10/app-openpgp.c:1271
-#: ../g10/app-openpgp.c:1285
-#: ../g10/app-openpgp.c:1360
-#: ../g10/app-openpgp.c:2167
-#: ../g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "validering av CHV%d misslyckades: %s\n"
-
-#: ../g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
-
-#: ../g10/app-openpgp.c:1323
-#: ../g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "fel när CHV-status hämtades från kortet\n"
-
-#: ../g10/app-openpgp.c:1329
-#: ../g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "kortet är permanent låst!\n"
-
-#: ../g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: ../g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN-kod"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: ../g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Ny Admin PIN-kod"
-
-#: ../g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN-kod"
-
-#: ../g10/app-openpgp.c:1494
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "fel när ny PIN-kod hämtades: %s\n"
-
-#: ../g10/app-openpgp.c:1544
-#: ../g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "fel vid läsning av programdata\n"
-
-#: ../g10/app-openpgp.c:1550
-#: ../g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "fel vid läsning av fingeravtryckets DO\n"
-
-#: ../g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "nyckeln finns redan\n"
-
-#: ../g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "befintlig nyckel kommer att ersättas\n"
-
-#: ../g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "genererar ny nyckel\n"
-
-#: ../g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "tidsstämpel för skapandet saknas\n"
-
-#: ../g10/app-openpgp.c:1740
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
-
-#: ../g10/app-openpgp.c:1747
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
-
-#: ../g10/app-openpgp.c:1755
-#: ../g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
-
-#: ../g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "misslyckades med att lagra nyckeln: %s\n"
-
-#: ../g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "var god vänta under tiden nyckeln genereras ...\n"
-
-#: ../g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "nyckelgenereringen misslyckades\n"
-
-#: ../g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
-
-#: ../g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
-
-#: ../g10/app-openpgp.c:2085
-#, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
-
-#: ../g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "signaturer skapade hittills: %lu\n"
-
-#: ../g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: ../g10/app-openpgp.c:2442
-msgid "verification of Admin PIN is currently prohibited through this command\n"
-msgstr "validering av Admin PIN-kod är för närvarande förbjudet genom detta kommando\n"
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: ../g10/app-openpgp.c:2513
-#: ../g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN-återanrop returnerade fel: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "validering av CHV%d misslyckades: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "fel när CHV-status hämtades från kortet\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "kortet är permanent låst!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Välj anledning till varför nyckeln spärras:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Ny Admin PIN-kod"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN-kod"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "fel när ny PIN-kod hämtades: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "fel vid läsning av programdata\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "fel vid läsning av fingeravtryckets DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "nyckeln finns redan\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "befintlig nyckel kommer att ersättas\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "genererar ny nyckel\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "genererar ny nyckel\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "tidsstämpel för skapandet saknas\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "misslyckades med att lagra nyckeln: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "var god vänta under tiden nyckeln genereras ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "nyckelgenereringen misslyckades\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signaturer skapade hittills: %lu\n"
+
+#: g10/app-openpgp.c:3497
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
+"kommando\n"
+
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
-#: ../g10/armor.c:383
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: ../g10/armor.c:422
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: ../g10/armor.c:433
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII-skal: "
 
-#: ../g10/armor.c:446
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#. Section 6.2: "Unknown keys should be reported to the user,
-#. but OpenPGP should continue to process the message."  Note
-#. that in a clearsigned message this applies to the signature
-#. part (i.e. "BEGIN PGP SIGNATURE") and not the signed data
-#. ("BEGIN PGP SIGNED MESSAGE").  The only key allowed in the
-#. signed data section is "Hash".
-#: ../g10/armor.c:459
+#: g10/armor.c:459
 msgid "unknown armor header: "
 msgstr "okänd ASCII-skalrubrik: "
 
-#: ../g10/armor.c:512
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: ../g10/armor.c:647
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#. Bad dash-escaping.
-#: ../g10/armor.c:659
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: ../g10/armor.c:813
-#: ../g10/armor.c:1423
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: ../g10/armor.c:856
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: ../g10/armor.c:890
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: ../g10/armor.c:898
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: ../g10/armor.c:902
-#: ../g10/armor.c:1460
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: ../g10/armor.c:922
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: ../g10/armor.c:926
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: ../g10/armor.c:1237
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: ../g10/armor.c:1242
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: ../g10/armor.c:1246
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+#: g10/armor.c:1246
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - detta\n"
-"beror sannolikt på att en felaktig e-postserver eller e-postklient har använts\n"
+"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - "
+"detta\n"
+"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
+"använts\n"
 
-#: ../g10/card-util.c:61
-#: ../g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: ../g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#. We don't yet support unattended key generation.
-#: ../g10/card-util.c:74
-#: ../g10/card-util.c:1409
-#: ../g10/delkey.c:126
-#: ../g10/keyedit.c:1516
-#: ../g10/keygen.c:2587
-#: ../g10/revoke.c:216
-#: ../g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: ../g10/card-util.c:101
-#: ../g10/card-util.c:1135
-#: ../g10/card-util.c:1218
-#: ../g10/keyedit.c:423
-#: ../g10/keyedit.c:444
-#: ../g10/keyedit.c:458
-#: ../g10/keygen.c:1400
-#: ../g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: ../g10/card-util.c:219
-#: ../g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: ../g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "man"
 
-#: ../g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "kvinna"
 
-#: ../g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: ../g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: ../g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "tvingad"
 
-#: ../g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: ../g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: ../g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: ../g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: ../g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: ../g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: ../g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:690
-#: ../g10/card-util.c:759
-#: ../g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: ../g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "Fel när \"%s\" skapades: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: ../g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: ../g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: ../g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: ../g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: ../g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: ../g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: ../g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: ../g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: ../g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: ../g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: ../g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: ../g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: ../g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel när aktuell nyckelinformation hämtades: %s\n"
 
-#: ../g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: ../g10/card-util.c:1057
-#: ../g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "avrundade uppåt till %u bitar\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: ../g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "hemlig nyckel redan lagrad på ett kort\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: ../g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -636,152 +682,148 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: ../g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: ../g10/card-util.c:1128
-#: ../g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: ../g10/card-util.c:1129
-#: ../g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: ../g10/card-util.c:1130
-#: ../g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#. Okay.
-#: ../g10/card-util.c:1146
-#: ../g10/card-util.c:1229
-#: ../g10/keyedit.c:938
-#: ../g10/keygen.c:1404
-#: ../g10/keygen.c:1432
-#: ../g10/keygen.c:1506
-#: ../g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: ../g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: ../g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: ../g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: ../g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: ../g10/card-util.c:1322
-#: ../g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: ../g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: ../g10/card-util.c:1325
-#: ../g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: ../g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: ../g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: ../g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: ../g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: ../g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: ../g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: ../g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: ../g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: ../g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: ../g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: ../g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: ../g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: ../g10/card-util.c:1460
-#: ../g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Kommando> "
 
-#: ../g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: ../g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: ../g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: ../g10/card-util.c:1605
-#: ../g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: ../g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "kortläsaren är inte tillgänglig\n"
 
-#: ../g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Mata in kortet och tryck Return eller \"c\" för att avbryta: "
 
-#: ../g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "val av openpgp misslyckades: %s\n"
 
-#: ../g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -790,321 +832,307 @@ msgstr ""
 "Ersätt det nuvarande kortet med det kort som har serienumret:\n"
 "   %.*s\n"
 
-#: ../g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tryck Return när du är färdig eller \"c\" för att avbryta: "
 
-#: ../g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Ange ny Admin PIN-kod: "
 
-#: ../g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Ange ny PIN-kod: "
 
-#: ../g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Ange Admin PIN-kod: "
 
-#: ../g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "Ange PIN-kod: "
 
-#: ../g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Upprepa denna PIN-kod: "
 
-#: ../g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
 # se förra kommentaren
-#: ../g10/decrypt.c:67
-#: ../g10/decrypt.c:158
-#: ../g10/gpg.c:3970
-#: ../g10/keyring.c:375
-#: ../g10/keyring.c:661
-#: ../g10/verify.c:101
-#: ../g10/verify.c:156
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: ../g10/decrypt.c:103
-#: ../g10/encode.c:823
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: ../g10/delkey.c:73
-#: ../g10/export.c:309
-#: ../g10/keyedit.c:3388
-#: ../g10/keyserver.c:1711
-#: ../g10/revoke.c:226
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/delkey.c:81
-#: ../g10/export.c:339
-#: ../g10/import.c:2378
-#: ../g10/keyserver.c:1725
-#: ../g10/revoke.c:232
-#: ../g10/revoke.c:476
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: ../g10/delkey.c:127
-#: ../g10/delkey.c:134
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: ../g10/delkey.c:133
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
 
-#: ../g10/delkey.c:145
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
 
-#: ../g10/delkey.c:153
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
 
-#: ../g10/delkey.c:163
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: ../g10/delkey.c:173
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: ../g10/delkey.c:204
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel för publika nyckeln \"%s\"!\n"
 
-#: ../g10/delkey.c:206
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: ../g10/encode.c:211
-#: ../g10/sign.c:1254
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: ../g10/encode.c:216
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: ../g10/encode.c:229
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använder chiffret %s\n"
 
-#: ../g10/encode.c:239
-#: ../g10/encode.c:534
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: ../g10/encode.c:290
-#: ../g10/encode.c:568
-#: ../g10/sign.c:559
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: ../g10/encode.c:454
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --pgp2-läge\n"
+msgstr ""
+"du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --"
+"pgp2-läge\n"
 
-#: ../g10/encode.c:478
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: ../g10/encode.c:506
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:506
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-chiffer för alla nycklar du krypterar till.\n"
 
-#: ../g10/encode.c:516
+#: g10/encode.c:516
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:612
-#: ../g10/sign.c:931
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:699
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgstr ""
+"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: ../g10/encode.c:769
-#: ../g10/pkclist.c:804
-#: ../g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: ../g10/encode.c:796
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: ../g10/encr-data.c:89
-#: ../g10/mainproc.c:296
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: ../g10/encr-data.c:91
-#: ../g10/mainproc.c:300
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: ../g10/encr-data.c:115
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+#: g10/encr-data.c:115
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: ../g10/encr-data.c:126
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: ../g10/exec.c:47
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
-#: ../g10/exec.c:174
-#: ../g10/openfile.c:429
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: ../g10/exec.c:315
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+#: g10/exec.c:315
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: ../g10/exec.c:345
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: ../g10/exec.c:423
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunde inte köra programmet \"%s\": %s\n"
 
-#: ../g10/exec.c:426
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: ../g10/exec.c:511
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: ../g10/exec.c:522
-#: ../g10/exec.c:588
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: ../g10/exec.c:537
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "kunde inte köra det externa programmet\n"
 
-#: ../g10/exec.c:553
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: ../g10/exec.c:599
-#: ../g10/exec.c:606
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: ../g10/exec.c:611
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
-#: ../g10/export.c:59
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som endast lokala"
 
-#: ../g10/export.c:61
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: ../g10/export.c:63
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: ../g10/export.c:65
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr "ta bort lösenfrasen från exporterade undernycklar"
 
-#: ../g10/export.c:67
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln vid exportering"
 
-#: ../g10/export.c:69
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln vid exportering"
 
-#: ../g10/export.c:323
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "export av hemliga nycklar tillåts inte\n"
 
-#: ../g10/export.c:352
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %s: inte skyddad - hoppade över\n"
 
-#: ../g10/export.c:360
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: ../g10/export.c:371
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: ../g10/export.c:519
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr "på väg att exportera en oskyddad undernyckel\n"
 
-#: ../g10/export.c:542
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att ta bort skydd på undernyckel: %s\n"
 
-#. I hope this warning doesn't confuse people.
-#: ../g10/export.c:563
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %s har ingen enkel SK-kontrollsumma\n"
 
-#: ../g10/export.c:596
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: ../g10/gpg.c:381
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1112,130 +1140,129 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: ../g10/gpg.c:383
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: ../g10/gpg.c:384
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: ../g10/gpg.c:385
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: ../g10/gpg.c:386
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: ../g10/gpg.c:388
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: ../g10/gpg.c:390
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: ../g10/gpg.c:392
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: ../g10/gpg.c:394
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: ../g10/gpg.c:396
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: ../g10/gpg.c:397
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: ../g10/gpg.c:398
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: ../g10/gpg.c:399
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: ../g10/gpg.c:400
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: ../g10/gpg.c:401
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: ../g10/gpg.c:403
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: ../g10/gpg.c:404
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: ../g10/gpg.c:405
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: ../g10/gpg.c:406
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: ../g10/gpg.c:407
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: ../g10/gpg.c:409
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: ../g10/gpg.c:410
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: ../g10/gpg.c:411
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:413
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: ../g10/gpg.c:415
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:419
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: ../g10/gpg.c:422
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: ../g10/gpg.c:423
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: ../g10/gpg.c:424
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: ../g10/gpg.c:433
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: ../g10/gpg.c:440
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: ../g10/gpg.c:444
-#: ../g10/gpgv.c:68
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1245,54 +1272,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: ../g10/gpg.c:446
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: ../g10/gpg.c:448
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: ../g10/gpg.c:459
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: ../g10/gpg.c:460
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: ../g10/gpg.c:465
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: ../g10/gpg.c:479
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: ../g10/gpg.c:481
-#: ../g10/gpgv.c:70
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "utförlig"
 
-#: ../g10/gpg.c:492
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: ../g10/gpg.c:493
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: ../g10/gpg.c:535
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: ../g10/gpg.c:536
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: ../g10/gpg.c:565
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1300,7 +1326,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: ../g10/gpg.c:568
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1320,19 +1346,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: ../g10/gpg.c:769
-#: ../g10/gpgv.c:95
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <gnupg-bugs@gnu.org>\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
 
-#: ../g10/gpg.c:786
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: ../g10/gpg.c:789
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1342,7 +1367,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: ../g10/gpg.c:800
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1350,656 +1375,661 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: ../g10/gpg.c:803
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: ../g10/gpg.c:809
-#: ../g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: ../g10/gpg.c:815
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: ../g10/gpg.c:821
-#: ../g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: ../g10/gpg.c:904
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: ../g10/gpg.c:1052
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: ../g10/gpg.c:1070
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: ../g10/gpg.c:1267
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1270
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: ../g10/gpg.c:1273
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1279
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1282
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: ../g10/gpg.c:1285
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1291
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1294
+#: g10/gpg.c:1294
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
+"s\"\n"
 
-#: ../g10/gpg.c:1297
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
+msgstr ""
+"VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1303
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1306
+#: g10/gpg.c:1306
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
+"\"%s\"\n"
 
-#: ../g10/gpg.c:1309
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
+msgstr ""
+"VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1484
+#: g10/gpg.c:1484
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: ../g10/gpg.c:1577
+#: g10/gpg.c:1577
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id vid nyckellistning"
 
-#: ../g10/gpg.c:1579
+#: g10/gpg.c:1579
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er vid signaturlistningar"
 
-#: ../g10/gpg.c:1581
+#: g10/gpg.c:1581
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer vid signaturlistningar"
 
-#: ../g10/gpg.c:1583
+#: g10/gpg.c:1583
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer vid signaturlistningar"
 
-#: ../g10/gpg.c:1587
+#: g10/gpg.c:1587
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer vid signaturlistningar"
 
-#: ../g10/gpg.c:1589
+#: g10/gpg.c:1589
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar vid signaturlistningar"
 
-#: ../g10/gpg.c:1591
+#: g10/gpg.c:1591
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar"
 
-#: ../g10/gpg.c:1593
+#: g10/gpg.c:1593
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: ../g10/gpg.c:1595
+#: g10/gpg.c:1595
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: ../g10/gpg.c:1597
+#: g10/gpg.c:1597
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: ../g10/gpg.c:1599
+#: g10/gpg.c:1599
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum vid signaturlistningar"
 
-#: ../g10/gpg.c:1801
+#: g10/gpg.c:1801
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: ../g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: ../g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: ../g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: ../g10/gpg.c:2286
-#: ../g10/gpg.c:2955
-#: ../g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: ../g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
+msgstr ""
+"chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
 
-#: ../g10/gpg.c:2488
-#: ../g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: ../g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: ../g10/gpg.c:2601
-#: ../g10/gpg.c:2790
-#: ../g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: ../g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: ../g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: ../g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: ../g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: ../g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id vid signaturvalidering"
 
-#: ../g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er vid signaturvalidering"
 
-#: ../g10/gpg.c:2658
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer vid signaturvalidering"
 
-#: ../g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer vid signaturvalidering"
 
-#: ../g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer vid signaturvalidering"
 
-#: ../g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver vid signaturvalidering"
 
-#: ../g10/gpg.c:2668
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: ../g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: ../g10/gpg.c:2672
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast den primära användaridentiteten i signaturvalidering"
 
-#: ../g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: ../g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: ../g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: ../g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: ../g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: ../g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: ../g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: ../g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: ../g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: ../g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
 
-#: ../g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: ../g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: ../g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: ../g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: ../g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: ../g10/gpg.c:3088
-#: ../g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: ../g10/gpg.c:3094
-#: ../g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: ../g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: ../g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: ../g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: ../g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
+msgstr ""
+"ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: ../g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: ../g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: ../g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: ../g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: ../g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: ../g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: ../g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: ../g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: ../g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
+msgstr ""
+"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
+msgstr ""
+"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: ../g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
+msgstr ""
+"VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: ../g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: ../g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: ../g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: ../g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: ../g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: ../g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: ../g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: ../g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: ../g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
+msgstr ""
+"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: ../g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: ../g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: ../g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: ../g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: ../g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: ../g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: ../g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: ../g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: ../g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: ../g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: ../g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: ../g10/gpg.c:3956
+#: g10/gpg.c:3956
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: ../g10/gpg.c:3960
+#: g10/gpg.c:3960
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: ../g10/gpg.c:4264
+#: g10/gpg.c:4264
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4266
+#: g10/gpg.c:4266
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4299
+#: g10/gpg.c:4299
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: ../g10/getkey.c:150
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: ../g10/getkey.c:173
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#: ../g10/getkey.c:946
-#: ../g10/getkey.c:956
-#: ../g10/getkey.c:966
-#: ../g10/getkey.c:982
-#: ../g10/getkey.c:997
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: ../g10/getkey.c:1829
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
+msgstr ""
+"Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: ../g10/getkey.c:2435
-#: ../g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: ../g10/getkey.c:2666
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: ../g10/getkey.c:2713
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: ../g10/gpgv.c:71
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: ../g10/gpgv.c:72
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: ../g10/gpgv.c:74
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: ../g10/gpgv.c:75
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: ../g10/gpgv.c:99
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: ../g10/gpgv.c:102
+#: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kontrollera signaturerna mot kända nycklar\n"
 
-#: ../g10/helptext.c:47
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2010,7 +2040,7 @@ msgstr ""
 "\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: ../g10/helptext.c:53
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2022,15 +2052,17 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: ../g10/helptext.c:60
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
-#: ../g10/helptext.c:64
-msgid "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Ange användaridentiteten för den adressat du vill skicka meddelandet till."
+#: g10/helptext.c:64
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr ""
+"Ange användaridentiteten för den adressat du vill skicka meddelandet till."
 
-#: ../g10/helptext.c:68
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2052,9 +2084,10 @@ msgstr ""
 "\n"
 "RSA kan användas för signaturer eller kryptering.\n"
 "\n"
-"Första (primär) nyckel måste alltid vara en nyckel som är kapabel att signera."
+"Första (primär) nyckel måste alltid vara en nyckel som är kapabel att "
+"signera."
 
-#: ../g10/helptext.c:82
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2064,21 +2097,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert först!"
 
-#: ../g10/helptext.c:89
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: ../g10/helptext.c:93
-#: ../g10/helptext.c:98
-#: ../g10/helptext.c:110
-#: ../g10/helptext.c:142
-#: ../g10/helptext.c:170
-#: ../g10/helptext.c:175
-#: ../g10/helptext.c:180
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: ../g10/helptext.c:103
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2090,19 +2118,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: ../g10/helptext.c:115
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: ../g10/helptext.c:120
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: ../g10/helptext.c:124
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: ../g10/helptext.c:129
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2116,61 +2144,84 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: ../g10/helptext.c:138
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: ../g10/helptext.c:146
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"När du signerar en användaridentitet på en nyckel, måste du först kontrollera att nyckeln\n"
-"verkligen tillhör den person som nämns i användaridentiteten. Det är viktigt för andra att\n"
+"När du signerar en användaridentitet på en nyckel, måste du först "
+"kontrollera att nyckeln\n"
+"verkligen tillhör den person som nämns i användaridentiteten. Det är viktigt "
+"för andra att\n"
 "få veta hur noga du har kontrollerat detta.\n"
 "\n"
-"\"0\" betyder att du inte påstår någonting om hur noga du kontrollerat nyckeln.\n"
+"\"0\" betyder att du inte påstår någonting om hur noga du kontrollerat "
+"nyckeln.\n"
 "\n"
-"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra det\n"
-"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är användbart för\n"
-"    en \"persona\"-kontroll, där du signerar nyckeln för en användare med pseudonym.\n"
+"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra "
+"det\n"
+"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är "
+"användbart för\n"
+"    en \"persona\"-kontroll, där du signerar nyckeln för en användare med "
+"pseudonym.\n"
 "\n"
-"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda att\n"
-"    du kontrollerade fingeravtrycket och kontrollerade användaridentiteten för nyckeln\n"
+"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda "
+"att\n"
+"    du kontrollerade fingeravtrycket och kontrollerade användaridentiteten "
+"för nyckeln\n"
 "    mot en fotolegitimation.\n"
 "\n"
-"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  Detta kan\n"
-"    t.ex. betyda att du kontrollerade nyckelns fingeravtryck direkt med nyckelinnehavaren\n"
-"    och att du kontrollerade, med hjälp av svårförfalskade identitetsdokument\n"
+"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  "
+"Detta kan\n"
+"    t.ex. betyda att du kontrollerade nyckelns fingeravtryck direkt med "
+"nyckelinnehavaren\n"
+"    och att du kontrollerade, med hjälp av svårförfalskade "
+"identitetsdokument\n"
 "a\n"
 "    med foto (t.ex. ett körkort) att namnet på innehavaren stämmer med\n"
-"    namnet i användaridentiteten på nyckeln, och slutligen att du kontrollerade att\n"
-"    (genom att utväxla e-postmeddelanden) att e-postadressen på nyckeln tillhör\n"
+"    namnet i användaridentiteten på nyckeln, och slutligen att du "
+"kontrollerade att\n"
+"    (genom att utväxla e-postmeddelanden) att e-postadressen på nyckeln "
+"tillhör\n"
 "    nyckelinnehavaren.\n"
 "\n"
 "Observera! Ovanstående exempel för nivåerna 2 och 3 är bara förslag.\n"
@@ -2180,11 +2231,11 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: ../g10/helptext.c:184
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: ../g10/helptext.c:188
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2192,11 +2243,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: ../g10/helptext.c:193
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: ../g10/helptext.c:198
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2207,7 +2258,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: ../g10/helptext.c:203
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2219,7 +2270,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: ../g10/helptext.c:209
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2228,7 +2279,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: ../g10/helptext.c:213
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2242,34 +2293,36 @@ msgstr ""
 "mer. Så gör bara detta om denna självsignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: ../g10/helptext.c:221
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"Ändra dina inställningar för alla användaridentiteter (eller enbart de valda)\n"
-"till den aktuella listan på inställningar. Tidsstämplingen för alla påverkade\n"
+"Ändra dina inställningar för alla användaridentiteter (eller enbart de "
+"valda)\n"
+"till den aktuella listan på inställningar. Tidsstämplingen för alla "
+"påverkade\n"
 "självsignaturer kommer att flyttas fram en sekund.\n"
 
-#: ../g10/helptext.c:228
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenfras. Detta är en hemlig mening\n"
 
-#: ../g10/helptext.c:234
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repetera sista lösenfrasen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: ../g10/helptext.c:238
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: ../g10/helptext.c:243
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om du vill skriva över filen"
 
-#: ../g10/helptext.c:248
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2277,7 +2330,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: ../g10/helptext.c:254
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2295,7 +2348,8 @@ msgstr ""
 "Du borde ange en anledning till spärrningen. Beroende på sammanhanget\n"
 "har du möjlighet att välja från följande lista:\n"
 "  \"Nyckeln har tappat sin säkerhet\"\n"
-"     Använd denna om du har anledning att tro att icke-auktoriserade personer\n"
+"     Använd denna om du har anledning att tro att icke-auktoriserade "
+"personer\n"
 "     har fått tillgång till din hemliga nyckel.\n"
 "  \"Nyckeln har ersatts\"\n"
 "     Använd denna om du har ersatt denna nyckel med en nyare.\n"
@@ -2306,589 +2360,569 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: ../g10/helptext.c:270
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 "Om du vill kan du ange en text som beskriver varför du utfärdar\n"
-"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort och koncis.\n"
+"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort "
+"och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: ../g10/helptext.c:285
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: ../g10/helptext.c:293
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: ../g10/import.c:94
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som endast lokala"
 
-#: ../g10/import.c:96
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern vid importering"
 
-#: ../g10/import.c:98
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: ../g10/import.c:100
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "skapa en publik nyckel när en hemlig nyckel importeras"
 
-#: ../g10/import.c:102
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: ../g10/import.c:104
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: ../g10/import.c:106
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: ../g10/import.c:265
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: ../g10/import.c:274
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: ../g10/import.c:291
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: ../g10/import.c:293
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: ../g10/import.c:296
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: ../g10/import.c:298
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: ../g10/import.c:304
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
 
-#: ../g10/import.c:306
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        nya användaridentiteter: %lu\n"
 
-#: ../g10/import.c:308
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nya undernycklar: %lu\n"
 
-#: ../g10/import.c:310
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                 nya signaturer: %lu\n"
 
-#: ../g10/import.c:312
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: ../g10/import.c:314
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    antal lästa hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:316
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importerade hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:318
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    oförändrade hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:320
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
 
-#: ../g10/import.c:322
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             signaturer rensade: %lu\n"
 
-#: ../g10/import.c:324
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: ../g10/import.c:565
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VARNING: nyckeln %s innehåller inställningar för otillgänglig\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: ../g10/import.c:569
+#: g10/import.c:569
 msgid "         algorithms on these user IDs:\n"
 msgstr " algoritmer på dessa användaridentiteter:\n"
 
-#: ../g10/import.c:606
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: ../g10/import.c:618
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: ../g10/import.c:630
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: ../g10/import.c:643
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: ../g10/import.c:645
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: ../g10/import.c:669
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
+msgstr ""
+"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: ../g10/import.c:719
-#: ../g10/import.c:1117
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: ../g10/import.c:748
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: ../g10/import.c:763
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "nyckel %s: accepterade icke-självsignerade användaridentiteten \"%s\"\n"
+msgstr ""
+"nyckel %s: accepterade icke-självsignerade användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:769
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: ../g10/import.c:771
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: ../g10/import.c:781
-#: ../g10/import.c:1239
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: ../g10/import.c:787
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: ../g10/import.c:796
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: ../g10/import.c:801
-#: ../g10/openfile.c:281
-#: ../g10/sign.c:799
-#: ../g10/sign.c:1104
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: ../g10/import.c:805
-#: ../g10/import.c:900
-#: ../g10/import.c:1157
-#: ../g10/import.c:1300
-#: ../g10/import.c:2392
-#: ../g10/import.c:2414
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2392 g10/import.c:2414
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:824
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: ../g10/import.c:848
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: ../g10/import.c:865
-#: ../g10/import.c:1257
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: ../g10/import.c:873
-#: ../g10/import.c:1264
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: ../g10/import.c:910
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: ../g10/import.c:913
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: ../g10/import.c:916
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: ../g10/import.c:919
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: ../g10/import.c:922
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: ../g10/import.c:925
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: ../g10/import.c:928
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: ../g10/import.c:931
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: ../g10/import.c:934
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensat\n"
 
-#: ../g10/import.c:937
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: ../g10/import.c:960
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: ../g10/import.c:1123
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#. We don't allow to import secret keys because that may be used
-#. to put a secret key into the keyring and the user might later
-#. be tricked into signing stuff with that key.
-#: ../g10/import.c:1134
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: ../g10/import.c:1151
-#: ../g10/import.c:2407
+#: g10/import.c:1151 g10/import.c:2407
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: ../g10/import.c:1162
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#. we can't merge secret keys
-#: ../g10/import.c:1192
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: ../g10/import.c:1202
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: ../g10/import.c:1232
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: ../g10/import.c:1275
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: ../g10/import.c:1307
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: ../g10/import.c:1373
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:1388
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "nyckel %s: algoritmen för publika nycklar stöds inte för användaridentiteten  \"%s\"\n"
+msgstr ""
+"nyckel %s: algoritmen för publika nycklar stöds inte för "
+"användaridentiteten  \"%s\"\n"
 
-#: ../g10/import.c:1390
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1408
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: ../g10/import.c:1419
-#: ../g10/import.c:1469
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: ../g10/import.c:1421
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: ../g10/import.c:1436
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: ../g10/import.c:1458
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: ../g10/import.c:1471
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: ../g10/import.c:1486
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: ../g10/import.c:1528
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1549
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: ../g10/import.c:1576
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1586
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: ../g10/import.c:1603
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: ../g10/import.c:1617
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: ../g10/import.c:1625
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1754
+#: g10/import.c:1754
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
+msgstr ""
+"nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: ../g10/import.c:1816
+#: g10/import.c:1816
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: ../g10/import.c:1830
+#: g10/import.c:1830
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: ../g10/import.c:1889
+#: g10/import.c:1889
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: ../g10/import.c:1923
+#: g10/import.c:1923
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: ../g10/import.c:2312
+#: g10/import.c:2312
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
+msgstr ""
+"OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: ../g10/import.c:2320
+#: g10/import.c:2320
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/import.c:2322
+#: g10/import.c:2322
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/keydb.c:166
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: ../g10/keydb.c:173
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keydb.c:314
-#: ../g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: ../g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: ../g10/keyedit.c:264
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: ../g10/keyedit.c:265
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: ../g10/keyedit.c:343
-#: ../g10/keylist.c:388
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: ../g10/keyedit.c:345
-#: ../g10/keylist.c:390
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: ../g10/keyedit.c:347
-#: ../g10/keylist.c:392
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: ../g10/keyedit.c:349
-#: ../g10/keylist.c:394
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
 
-#: ../g10/keyedit.c:351
-#: ../g10/keylist.c:396
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: ../g10/keyedit.c:353
-#: ../g10/keylist.c:398
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
 
-#: ../g10/keyedit.c:355
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: ../g10/keyedit.c:357
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
 
-#. Same string as pkclist.c:do_edit_ownertrust
-#. This string also used in keyedit.c:trustsig_prompt
-#: ../g10/keyedit.c:413
-#: ../g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "Bestäm hur mycket du litar på denna användare när det gäller att\n"
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: ../g10/keyedit.c:417
-#: ../g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: ../g10/keyedit.c:418
-#: ../g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: ../g10/keyedit.c:437
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2898,52 +2932,46 @@ msgstr ""
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: ../g10/keyedit.c:453
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
+msgstr ""
+"Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: ../g10/keyedit.c:598
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: ../g10/keyedit.c:607
-#: ../g10/keyedit.c:635
-#: ../g10/keyedit.c:662
-#: ../g10/keyedit.c:828
-#: ../g10/keyedit.c:888
-#: ../g10/keyedit.c:1738
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: ../g10/keyedit.c:621
-#: ../g10/keyedit.c:649
-#: ../g10/keyedit.c:676
-#: ../g10/keyedit.c:834
-#: ../g10/keyedit.c:1744
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: ../g10/keyedit.c:626
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
 
-#: ../g10/keyedit.c:654
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: ../g10/keyedit.c:682
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: ../g10/keyedit.c:684
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: ../g10/keyedit.c:706
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2952,11 +2980,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: ../g10/keyedit.c:715
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: ../g10/keyedit.c:729
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2965,13 +2993,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: ../g10/keyedit.c:733
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/n) "
+msgstr ""
+"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
+"n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: ../g10/keyedit.c:754
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2980,83 +3008,89 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: ../g10/keyedit.c:758
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
 
-#: ../g10/keyedit.c:779
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: ../g10/keyedit.c:782
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: ../g10/keyedit.c:787
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: ../g10/keyedit.c:809
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: ../g10/keyedit.c:822
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: ../g10/keyedit.c:840
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: ../g10/keyedit.c:846
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
+msgstr ""
+"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: ../g10/keyedit.c:881
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-läge\n"
+#: g10/keyedit.c:881
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
+"läge\n"
 
-#: ../g10/keyedit.c:883
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: ../g10/keyedit.c:908
+#: g10/keyedit.c:908
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: ../g10/keyedit.c:913
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jag vill inte svara.%s\n"
 
-#: ../g10/keyedit.c:915
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
 
-#: ../g10/keyedit.c:917
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jag har gjort viss kontroll.%s\n"
 
-#: ../g10/keyedit.c:919
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: ../g10/keyedit.c:925
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: ../g10/keyedit.c:949
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3065,83 +3099,76 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: ../g10/keyedit.c:956
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: ../g10/keyedit.c:962
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: ../g10/keyedit.c:970
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: ../g10/keyedit.c:980
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
 
-#: ../g10/keyedit.c:987
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: ../g10/keyedit.c:994
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: ../g10/keyedit.c:999
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1004
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1014
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: ../g10/keyedit.c:1059
-#: ../g10/keyedit.c:4795
-#: ../g10/keyedit.c:4886
-#: ../g10/keyedit.c:4950
-#: ../g10/keyedit.c:5011
-#: ../g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:1124
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras att ändra.\n"
+msgstr ""
+"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
+"att ändra.\n"
 
-#: ../g10/keyedit.c:1135
-#: ../g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: ../g10/keyedit.c:1139
-#: ../g10/keygen.c:3214
-#: ../g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: ../g10/keyedit.c:1143
-#: ../g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: ../g10/keyedit.c:1147
-#: ../g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: ../g10/keyedit.c:1171
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: ../g10/keyedit.c:1177
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3149,12 +3176,11 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: ../g10/keyedit.c:1186
-#: ../g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
-#: ../g10/keyedit.c:1191
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3162,435 +3188,424 @@ msgstr ""
 "Du vill inte ha någon lösenfras - detta är möjligen en *dålig* idé!\n"
 "\n"
 
-#: ../g10/keyedit.c:1194
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: ../g10/keyedit.c:1265
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: ../g10/keyedit.c:1351
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: ../g10/keyedit.c:1354
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: ../g10/keyedit.c:1355
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: ../g10/keyedit.c:1357
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: ../g10/keyedit.c:1358
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: ../g10/keyedit.c:1359
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: ../g10/keyedit.c:1364
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
+msgstr ""
+"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#. "lsign" and friends will never match since "sign" comes first
-#. and it is a tail match.  They are just here so they show up in
-#. the help menu.
-#: ../g10/keyedit.c:1369
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: ../g10/keyedit.c:1371
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: ../g10/keyedit.c:1373
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: ../g10/keyedit.c:1377
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: ../g10/keyedit.c:1379
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: ../g10/keyedit.c:1381
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: ../g10/keyedit.c:1386
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: ../g10/keyedit.c:1390
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1392
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1394
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: ../g10/keyedit.c:1398
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: ../g10/keyedit.c:1400
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: ../g10/keyedit.c:1402
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: ../g10/keyedit.c:1404
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: ../g10/keyedit.c:1406
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: ../g10/keyedit.c:1408
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: ../g10/keyedit.c:1411
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: ../g10/keyedit.c:1413
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: ../g10/keyedit.c:1415
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1420
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "ställ in url till föredragen nyckelserver för valda användaridentiteter"
+msgstr ""
+"ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1422
+#: g10/keyedit.c:1422
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1424
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: ../g10/keyedit.c:1428
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: ../g10/keyedit.c:1430
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: ../g10/keyedit.c:1432
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: ../g10/keyedit.c:1437
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: ../g10/keyedit.c:1438
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: ../g10/keyedit.c:1439
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: ../g10/keyedit.c:1440
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: ../g10/keyedit.c:1442
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort oanvändbara signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
+"signaturer från nyckeln"
 
-#: ../g10/keyedit.c:1444
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
+"nyckeln"
 
-#: ../g10/keyedit.c:1566
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1584
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: ../g10/keyedit.c:1665
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: ../g10/keyedit.c:1673
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: ../g10/keyedit.c:1692
+#: g10/keyedit.c:1692
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
-"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer (lsign),\n"
-"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara signaturer\n"
+"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer "
+"(lsign),\n"
+"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara "
+"signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: ../g10/keyedit.c:1732
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: ../g10/keyedit.c:1751
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1758
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: ../g10/keyedit.c:1767
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: ../g10/keyedit.c:1790
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: ../g10/keyedit.c:1812
-#: ../g10/keyedit.c:1832
-#: ../g10/keyedit.c:1998
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: ../g10/keyedit.c:1814
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: ../g10/keyedit.c:1816
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1817
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:1867
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:1879
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: ../g10/keyedit.c:1907
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: ../g10/keyedit.c:1921
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1938
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1962
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: ../g10/keyedit.c:1965
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: ../g10/keyedit.c:1966
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: ../g10/keyedit.c:2001
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:2002
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:2020
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:2031
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: ../g10/keyedit.c:2033
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: ../g10/keyedit.c:2083
+#: g10/keyedit.c:2083
 msgid "Owner trust may not be set while using a user provided trust database\n"
-msgstr "Ägartillit får inte ställas in när en tillitsdatabas används som användaren tillhandahåller\n"
+msgstr ""
+"Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
+"tillhandahåller\n"
 
-#: ../g10/keyedit.c:2125
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: ../g10/keyedit.c:2131
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? (j/N) "
+msgstr ""
+"Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
+"(j/N) "
 
-#: ../g10/keyedit.c:2133
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: ../g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: ../g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: ../g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: ../g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: ../g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: ../g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: ../g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: ../g10/keyedit.c:2407
-#: ../g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: ../g10/keyedit.c:2415
-#: ../g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: ../g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-typ.\n"
+msgstr ""
+"Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
+"typ.\n"
 
-#: ../g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: ../g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: ../g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: ../g10/keyedit.c:2728
-#: ../g10/keyedit.c:2784
-#: ../g10/keyedit.c:2845
-#: ../g10/keyedit.c:2860
-#: ../g10/keylist.c:192
-#: ../g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: ../g10/keyedit.c:2731
-#: ../g10/keylist.c:769
-#: ../g10/keylist.c:863
-#: ../g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: ../g10/keyedit.c:2733
-#: ../g10/keylist.c:740
-#: ../g10/keylist.c:775
-#: ../g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: ../g10/keyedit.c:2735
-#: ../g10/keyedit.c:2786
-#: ../g10/keyedit.c:2847
-#: ../g10/keyedit.c:2862
-#: ../g10/keylist.c:194
-#: ../g10/keylist.c:746
-#: ../g10/keylist.c:781
-#: ../g10/keylist.c:875
-#: ../g10/keylist.c:896
-#: ../g10/keyserver.c:523
-#: ../g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: ../g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: ../g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: ../g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: ../g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: ../g10/keyedit.c:2791
-#: ../g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: ../g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3598,25 +3613,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: ../g10/keyedit.c:2879
-#: ../g10/keyedit.c:3225
-#: ../g10/keyserver.c:527
-#: ../g10/mainproc.c:1815
-#: ../g10/trustdb.c:1177
-#: ../g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "spärrad"
 
-#: ../g10/keyedit.c:2881
-#: ../g10/keyedit.c:3227
-#: ../g10/keyserver.c:531
-#: ../g10/mainproc.c:1817
-#: ../g10/trustdb.c:530
-#: ../g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "utgånget"
 
-#: ../g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3625,360 +3632,345 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: ../g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: ../g10/keyedit.c:3012
-#: ../g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: ../g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: ../g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: ../g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: ../g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: ../g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: ../g10/keyedit.c:3229
-#: ../g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: ../g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: ../g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentiteten \"%s\": %d signatur borttagen\n"
 
-#: ../g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentiteten \"%s\": %d signaturer borttagna\n"
 
-#: ../g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentiteten \"%s\": redan minimerad\n"
 
-#: ../g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: ../g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan denna\n"
+"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan "
+"denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: ../g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: ../g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: ../g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#. 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:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: ../g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som spärrnyckel\n"
 
-#: ../g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: ../g10/keyedit.c:3460
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
+#: g10/keyedit.c:3462
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgstr ""
+"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: ../g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: ../g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: ../g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: ../g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: ../g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: ../g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: ../g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: ../g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: ../g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: ../g10/keyedit.c:3887
-#: ../g10/keyedit.c:3997
-#: ../g10/keyedit.c:4117
-#: ../g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: ../g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: ../g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: ../g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Inget användaridentitet med indexet %d\n"
 
-#: ../g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Inget användaridentitet med hashen %s\n"
 
-#: ../g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: ../g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: ../g10/keyedit.c:4637
-#: ../g10/keyedit.c:4701
-#: ../g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: ../g10/keyedit.c:4639
-#: ../g10/keyedit.c:4703
-#: ../g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: ../g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: ../g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: ../g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#. FIXME: detect duplicates here
-#: ../g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: ../g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: ../g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: ../g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: ../g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: ../g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: ../g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrat\n"
 
-#. 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:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i framtiden\n"
+msgstr ""
+"VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
+"framtiden\n"
 
-#: ../g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 
-#: ../g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: ../g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: ../g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: ../g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: ../g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: ../g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: ../g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: ../g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: ../g10/keygen.c:1026
-#: ../g10/keygen.c:1109
-#: ../g10/keygen.c:1114
-#: ../g10/keygen.c:1231
-#: ../g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: ../g10/keygen.c:1031
-#: ../g10/keygen.c:1120
-#: ../g10/keygen.c:1236
-#: ../g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: ../g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "Signera"
 
-#: ../g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "Certifiera"
 
-#: ../g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -3995,111 +3987,105 @@ msgstr "Autentisera"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: ../g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: ../g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: ../g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: ../g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: ../g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: ../g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: ../g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: ../g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: ../g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: ../g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA och Elgamal (standard)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: ../g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
-
-#: ../g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (endast kryptering)\n"
-
-#: ../g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: ../g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (endast kryptering)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: ../g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: ../g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
-
-#: ../g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: ../g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: ../g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
-
-#: ../g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: ../g10/keygen.c:1575
-#: ../g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "avrundade uppåt till %u bitar\n"
-
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4116,7 +4102,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4132,38 +4118,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: ../g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: ../g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: ../g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: ../g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: ../g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: ../g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: ../g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: ../g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4171,63 +4157,66 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: ../g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: ../g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Du behöver en användaridentitet för att identifiera din nyckel; programvaran\n"
-"konstruerar en användaridentitet från verkligt namn, kommentar och e-postadress\n"
+"Du behöver en användaridentitet för att identifiera din nyckel; "
+"programvaran\n"
+"konstruerar en användaridentitet från verkligt namn, kommentar och e-"
+"postadress\n"
 "enligt följande format: \n"
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: ../g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Namn: "
 
-#: ../g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: ../g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: ../g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: ../g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: ../g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: ../g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: ../g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: ../g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: ../g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4238,7 +4227,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: ../g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4254,24 +4243,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: ../g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: ../g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: ../g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: ../g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: ../g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4279,13 +4268,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: ../g10/keygen.c:1907
-#: ../g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: ../g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4297,7 +4285,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: ../g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4309,802 +4297,777 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropidata.\n"
 
-#: ../g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: ../g10/keygen.c:2932
-#: ../g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: ../g10/keygen.c:2934
-#: ../g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skrier hemliga nyckelstumpen till \"%s\"\n"
 
-#: ../g10/keygen.c:2937
-#: ../g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: ../g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: ../g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: ../g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: ../g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Observera att denna nyckel inte kan användas för kryptering. Du kanske\n"
-"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta syfte.\n"
+"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
+"syfte.\n"
 
-#: ../g10/keygen.c:3145
-#: ../g10/keygen.c:3274
-#: ../g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: ../g10/keygen.c:3197
-#: ../g10/keygen.c:3324
-#: ../g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3199
-#: ../g10/keygen.c:3326
-#: ../g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3208
-#: ../g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: ../g10/keygen.c:3247
-#: ../g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: ../g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: ../g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: ../g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: ../g10/keyid.c:496
-#: ../g10/keyid.c:508
-#: ../g10/keyid.c:520
-#: ../g10/keyid.c:532
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "aldrig"
 
-#: ../g10/keylist.c:263
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: ../g10/keylist.c:265
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: ../g10/keylist.c:304
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: ../g10/keylist.c:357
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: ../g10/keylist.c:359
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: ../g10/keylist.c:469
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: ../g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: ../g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#. use tty
-#: ../g10/keylist.c:1518
-#: ../g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#. Handled elsewhere.
-#: ../g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: ../g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: ../g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: ../g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: ../g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: ../g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: ../g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: ../g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "inkludera spärrade nycklar i sökresultatet"
 
-#: ../g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "inkludera undernycklar vid sökning efter nyckel-id"
 
-#: ../g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
-msgstr "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
+msgstr ""
+"använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
 
-#: ../g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "ta inte bort temporärfiler efter de använts"
 
-#: ../g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "hämta automatiskt nycklar vid validering av signaturer"
 
-#: ../g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: ../g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
 
-#: ../g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
+msgstr ""
+"VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
 
-#: ../g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: ../g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: ../g10/keyserver.c:814
-#: ../g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: ../g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: ../g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: ../g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nycken %s till %s-servern %s\n"
 
-#: ../g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: ../g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: ../g10/keyserver.c:1392
-#: ../g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: ../g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: ../g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: ../g10/keyserver.c:1511
-#: ../g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: ../g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: ../g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: ../g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: ../g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: ../g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: ../g10/keyserver.c:1588
-#: ../g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: ../g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: ../g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: ../g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: ../g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: ../g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: ../g10/mainproc.c:243
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: ../g10/mainproc.c:294
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: ../g10/mainproc.c:304
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: ../g10/mainproc.c:385
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: ../g10/mainproc.c:449
+#: g10/mainproc.c:449
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: ../g10/mainproc.c:482
+#: g10/mainproc.c:482
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: ../g10/mainproc.c:486
-#: ../g10/pkclist.c:220
+#: g10/mainproc.c:486 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: ../g10/mainproc.c:490
+#: g10/mainproc.c:490
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: ../g10/mainproc.c:504
+#: g10/mainproc.c:504
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: ../g10/mainproc.c:518
+#: g10/mainproc.c:518
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: ../g10/mainproc.c:520
+#: g10/mainproc.c:520
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: ../g10/mainproc.c:551
-#: ../g10/mainproc.c:573
+#: g10/mainproc.c:551 g10/mainproc.c:573
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: ../g10/mainproc.c:559
+#: g10/mainproc.c:559
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s istället\n"
+msgstr ""
+"IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
+"istället\n"
 
-#: ../g10/mainproc.c:591
+#: g10/mainproc.c:591
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: ../g10/mainproc.c:595
+#: g10/mainproc.c:595
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: ../g10/mainproc.c:608
+#: g10/mainproc.c:608
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: ../g10/mainproc.c:614
+#: g10/mainproc.c:614
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: ../g10/mainproc.c:635
+#: g10/mainproc.c:635
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: ../g10/mainproc.c:637
+#: g10/mainproc.c:637
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: ../g10/mainproc.c:722
+#: g10/mainproc.c:722
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter sedda\n"
 
-#: ../g10/mainproc.c:850
+#: g10/mainproc.c:850
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: ../g10/mainproc.c:1198
+#: g10/mainproc.c:1198
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: ../g10/mainproc.c:1441
+#: g10/mainproc.c:1441
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utelämnad\n"
 
-#: ../g10/mainproc.c:1550
+#: g10/mainproc.c:1550
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: ../g10/mainproc.c:1561
+#: g10/mainproc.c:1561
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: ../g10/mainproc.c:1562
+#: g10/mainproc.c:1562
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: ../g10/mainproc.c:1566
+#: g10/mainproc.c:1566
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
-#: ../g10/mainproc.c:1586
+#: g10/mainproc.c:1586
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: ../g10/mainproc.c:1719
-#: ../g10/mainproc.c:1767
+#: g10/mainproc.c:1719 g10/mainproc.c:1767
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: ../g10/mainproc.c:1721
-#: ../g10/mainproc.c:1769
+#: g10/mainproc.c:1721 g10/mainproc.c:1769
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: ../g10/mainproc.c:1723
-#: ../g10/mainproc.c:1771
+#: g10/mainproc.c:1723 g10/mainproc.c:1771
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: ../g10/mainproc.c:1775
+#: g10/mainproc.c:1775
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: ../g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: ../g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: ../g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: ../g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: ../g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "binär"
 
-#: ../g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "textläge"
 
-#: ../g10/mainproc.c:1916
-#: ../g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "okänd"
 
-#: ../g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: ../g10/mainproc.c:2005
-#: ../g10/mainproc.c:2021
-#: ../g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: ../g10/mainproc.c:2048
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "VARNING: multipla signaturer upptäckta. Endast den första kommer att kontrolleras.\n"
+#: g10/mainproc.c:2049
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
+"kontrolleras.\n"
 
-#: ../g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: ../g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: ../g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: ../g10/misc.c:120
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: ../g10/misc.c:140
-#: ../g10/misc.c:168
-#: ../g10/misc.c:240
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:205
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:314
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: ../g10/misc.c:320
+#: g10/misc.c:320
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "VARNING: Elgamal-nycklar för signering/kryptering är föråldrade\n"
 
-#: ../g10/misc.c:333
+#: g10/misc.c:333
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: ../g10/misc.c:348
+#: g10/misc.c:348
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: ../g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
-
-#: ../g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-kryptering är inte installerat\n"
 
-#: ../g10/misc.c:460
-#: ../g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: ../g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat \"%s\"\n"
 
-#: ../g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: ../g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: ../g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: ../g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
-#: ../g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: ../g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: ../g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: ../g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#. do not overwrite
-#: ../g10/openfile.c:88
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: ../g10/openfile.c:92
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: ../g10/openfile.c:125
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: ../g10/openfile.c:147
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: ../g10/openfile.c:192
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: ../g10/openfile.c:319
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: ../g10/openfile.c:398
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: ../g10/openfile.c:400
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
+msgstr ""
+"VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: ../g10/openfile.c:432
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: ../g10/parse-packet.c:142
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: ../g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: ../g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: ../g10/passphrase.c:308
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: ../g10/passphrase.c:324
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: ../g10/passphrase.c:343
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: ../g10/passphrase.c:360
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: ../g10/passphrase.c:377
-#: ../g10/passphrase.c:653
-#: ../g10/passphrase.c:743
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med agenten - inaktiverar användning av agent\n"
 
-#: ../g10/passphrase.c:530
-#: ../g10/passphrase.c:912
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: ../g10/passphrase.c:544
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5115,31 +5078,27 @@ msgstr ""
 "nyckeln för användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, id %s, skapad %s%s\n"
 
-#: ../g10/passphrase.c:569
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: ../g10/passphrase.c:571
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#. 99 is GPG_ERR_CANCELED.
-#: ../g10/passphrase.c:647
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: ../g10/passphrase.c:803
-#: ../g10/passphrase.c:972
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga om lösenfras i satsläge\n"
 
-#. Read the passphrase from the tty or the command-fd.
-#: ../g10/passphrase.c:810
-#: ../g10/passphrase.c:977
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Ange lösenfras: "
 
-#: ../g10/passphrase.c:893
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5148,21 +5107,21 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: ../g10/passphrase.c:899
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: ../g10/passphrase.c:908
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
 
-#: ../g10/passphrase.c:985
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenfrasen: "
 
-#: ../g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5176,135 +5135,120 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: ../g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: ../g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: ../g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: ../g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: ../g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: ../g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr "ingen fotovisare inställd\n"
 
-#: ../g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
 
-#: ../g10/pkclist.c:63
-#: ../g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: ../g10/pkclist.c:65
-#: ../g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: ../g10/pkclist.c:67
-#: ../g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: ../g10/pkclist.c:69
-#: ../g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: ../g10/pkclist.c:71
-#: ../g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: ../g10/pkclist.c:75
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: ../g10/pkclist.c:92
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "spärrkommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#. A string with valid answers.
-#.
-#. Note to translators: These are the allowed answers in lower and
-#. uppercase.  Below you will find the matching strings which
-#. should be translated accordingly and the letter changed to
-#. match the one in the answer string.
-#.
-#. i = please show me more information
-#. m = back to the main menu
-#. s = skip this key
-#. q = quit
-#.
-#: ../g10/pkclist.c:207
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImHhAsS"
 
-#: ../g10/pkclist.c:215
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Inget tillitsvärde tilldelat till:\n"
 
-#: ../g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  även känd som \"%s\"\n"
 
-#: ../g10/pkclist.c:257
-msgid "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
+#: g10/pkclist.c:258
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
 
-#: ../g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jag vet inte eller kan inte säga något\n"
 
-#: ../g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jag litar INTE\n"
 
-#: ../g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jag litar förbehållslöst\n"
 
-#: ../g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  h = gå tillbaka till huvudmenyn\n"
 
-#: ../g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = hoppa över denna nyckel\n"
 
-#: ../g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  a = avsluta\n"
 
-#: ../g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5313,38 +5257,40 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: ../g10/pkclist.c:300
-#: ../g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: ../g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
 
-#: ../g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: ../g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
-msgstr "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
 
-#: ../g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
-msgstr "%s: Det finns viss information om att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns viss information om att nyckeln tillhör den angivna "
+"användaren\n"
 
-#: ../g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: ../g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: ../g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5354,110 +5300,109 @@ msgstr ""
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du\n"
 "svara ja på nästkommande fråga.\n"
 
-#: ../g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: ../g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: ../g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: ../g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: ../g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
 
-#: ../g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: ../g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
 
-#: ../g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
 
-#: ../g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
 
-#: ../g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
 
-#: ../g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: ../g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: ../g10/pkclist.c:605
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
+#: g10/pkclist.c:606
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: ../g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: ../g10/pkclist.c:622
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:623
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: ../g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:823
-#: ../g10/pkclist.c:865
-#: ../g10/pkclist.c:1077
-#: ../g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: ../g10/pkclist.c:835
-#: ../g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: ../g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: ../g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: ../g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5465,29 +5410,29 @@ msgstr ""
 "\n"
 "Ange användaridentiteten.  Avsluta med en tom rad: "
 
-#: ../g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Inget sådan användaridentitet.\n"
 
-#: ../g10/pkclist.c:970
-#: ../g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
-msgstr "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
+msgstr ""
+"hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: ../g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: ../g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: ../g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
 
-#: ../g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
@@ -5495,100 +5440,95 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: ../g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: ../g10/plaintext.c:95
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: ../g10/plaintext.c:139
-#: ../g10/plaintext.c:144
-#: ../g10/plaintext.c:162
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: ../g10/plaintext.c:461
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: ../g10/plaintext.c:467
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: ../g10/plaintext.c:499
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: ../g10/plaintext.c:533
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: ../g10/plaintext.c:547
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
-#: ../g10/pubkey-enc.c:102
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
 
-#: ../g10/pubkey-enc.c:133
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den anonyma mottagaren.\n"
 
-#: ../g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: ../g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller inaktiverad\n"
 
-#: ../g10/pubkey-enc.c:280
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
+msgstr ""
+"VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: ../g10/pubkey-enc.c:300
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: ../g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
-#: ../g10/revoke.c:102
-#: ../g10/revoke.c:116
-#: ../g10/revoke.c:128
-#: ../g10/revoke.c:174
-#: ../g10/revoke.c:186
-#: ../g10/revoke.c:586
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: ../g10/revoke.c:145
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckeln %s innehåller inga användaridentiteter\n"
 
-#: ../g10/revoke.c:306
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Kommer att spärras av:\n"
 
-#: ../g10/revoke.c:310
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: ../g10/revoke.c:314
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -5597,56 +5537,52 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: ../g10/revoke.c:327
-#: ../g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: ../g10/revoke.c:342
-#: ../g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:405
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: ../g10/revoke.c:411
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: ../g10/revoke.c:469
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen motsvarande publik nyckel: %s\n"
 
-#: ../g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "publika nyckeln passar inte ihop med den hemliga nyckeln!\n"
 
-#: ../g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: ../g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "okänd skyddsalgoritm\n"
 
-#: ../g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5664,241 +5600,257 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: ../g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: ../g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: ../g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: ../g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: ../g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: ../g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
-#: ../g10/seckey-cert.c:53
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: ../g10/seckey-cert.c:59
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../g10/seckey-cert.c:70
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: ../g10/seckey-cert.c:264
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig lösenfras; försök igen"
 
-#: ../g10/seckey-cert.c:265
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: ../g10/seckey-cert.c:326
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenfras igen.\n"
 
-#: ../g10/seckey-cert.c:364
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga nyckeln\n"
+msgstr ""
+"skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
+"nyckeln\n"
 
-#: ../g10/seskey.c:51
+#: g10/seskey.c:51
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: ../g10/seskey.c:56
+#: g10/seskey.c:56
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: ../g10/seskey.c:218
+#: g10/seskey.c:218
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: ../g10/seskey.c:232
+#: g10/seskey.c:232
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: ../g10/seskey.c:244
+#: g10/seskey.c:244
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#. Sanity check that the md has a context for the hash that the
-#. sig is expecting.  This can happen if a onepass sig header does
-#. not match the actual sig, and also if the clearsign "Hash:"
-#. header is missing or does not match the actual sig.
-#: ../g10/sig-check.c:74
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: ../g10/sig-check.c:99
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
 # cross-certification?
-#: ../g10/sig-check.c:111
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: ../g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
-#: ../g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: ../g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
+"klocka)\n"
 
-#: ../g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
+"felinställd klocka)\n"
 
-#: ../g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: ../g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
+msgstr ""
+"antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: ../g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: ../g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
-#: ../g10/sign.c:90
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan expansion.\n"
+msgstr ""
+"VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
+"expansion.\n"
 
-#: ../g10/sign.c:116
+#: g10/sign.c:116
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera policy-url (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera policy-url (för stor).  Använder "
+"oexpanderad.\n"
 
-#: ../g10/sign.c:139
+#: g10/sign.c:139
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
+"stor).  Använder oexpanderad.\n"
 
-#: ../g10/sign.c:312
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: ../g10/sign.c:321
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: ../g10/sign.c:756
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:830
+#: g10/sign.c:830
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/sign.c:956
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signerar:"
 
-#: ../g10/sign.c:1069
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:1248
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: ../g10/skclist.c:126
-#: ../g10/skclist.c:190
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "nyckeln är inte markerad som osäker - det går inte att använda den med fejkad slumptalsgenerator!\n"
+msgstr ""
+"nyckeln är inte markerad som osäker - det går inte att använda den med "
+"fejkad slumptalsgenerator!\n"
 
-#: ../g10/skclist.c:157
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: ../g10/skclist.c:165
-#: ../g10/skclist.c:175
-#: ../g10/skclist.c:184
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: ../g10/skclist.c:170
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: ../g10/skclist.c:185
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
+msgstr ""
+"det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: ../g10/tdbdump.c:58
-#: ../g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: ../g10/tdbdump.c:103
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5907,241 +5859,236 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: ../g10/tdbdump.c:158
-#: ../g10/tdbdump.c:166
-#: ../g10/tdbdump.c:171
-#: ../g10/tdbdump.c:176
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:158
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "raden är för lång"
 
-#: ../g10/tdbdump.c:166
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "kolon saknas"
 
-#: ../g10/tdbdump.c:172
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ogiltigt fingeravtryck"
 
-#: ../g10/tdbdump.c:177
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "värde för ägartillit saknas"
 
-#. error
-#: ../g10/tdbdump.c:213
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:217
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: ../g10/tdbdump.c:226
-#: ../g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: ../g10/tdbio.c:127
-#: ../g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:133
-#: ../g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:243
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: ../g10/tdbio.c:496
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: ../g10/tdbio.c:511
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: ../g10/tdbio.c:521
-#: ../g10/tdbio.c:544
-#: ../g10/tdbio.c:587
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: ../g10/tdbio.c:523
-#: ../g10/tdbio.c:590
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: ../g10/tdbio.c:549
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: ../g10/tdbio.c:553
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:556
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: ../g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: ../g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: ../g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: ../g10/tdbio.c:674
-#: ../g10/tdbio.c:694
-#: ../g10/tdbio.c:710
-#: ../g10/tdbio.c:724
-#: ../g10/tdbio.c:754
-#: ../g10/tdbio.c:1376
-#: ../g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: ../g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: ../g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: ../g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: ../g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: ../g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: ../g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: ../g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
+#: g10/tdbio.c:1502
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: tillitsdatabas skapad\n"
 
-#: ../g10/textfilter.c:147
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: ../g10/textfilter.c:246
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: ../g10/trustdb.c:225
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: ../g10/trustdb.c:256
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: ../g10/trustdb.c:294
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: ../g10/trustdb.c:309
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: ../g10/trustdb.c:319
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
 
 # req står för request
 # kollat med Werner. Per
-#: ../g10/trustdb.c:343
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: ../g10/trustdb.c:349
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: ../g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
+msgstr ""
+"kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: ../g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -6155,125 +6102,128 @@ msgstr "använder tillitsmodellen %s\n"
 #    It gets passed to atoi() so everything after the number is
 #    essentially a comment and need not be translated.  Either key and
 #    uid are both NULL, or neither are NULL. */
-#: ../g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: ../g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: ../g10/trustdb.c:507
-#: ../g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: ../g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: ../g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: ../g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: ../g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: ../g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: ../g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "odefinierad"
 
-#: ../g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "aldrig"
 
-#: ../g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "marginell"
 
-#: ../g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "fullständig"
 
-#: ../g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: ../g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: ../g10/trustdb.c:581
-#: ../g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: ../g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
+msgstr ""
+"det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
+msgstr ""
+"det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:837
-#: ../g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: ../g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: ../g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: ../g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: ../g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: ../g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: ../g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: ../g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
-msgstr "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+"djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: ../g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning misslyckades: %s\n"
+msgstr ""
+"kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
+"misslyckades: %s\n"
 
-#: ../g10/verify.c:116
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6283,318 +6233,321 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: ../g10/verify.c:192
+#: g10/verify.c:192
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: ../util/errors.c:53
+#: util/errors.c:53
 msgid "general error"
 msgstr "allmänt fel"
 
-#: ../util/errors.c:54
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "okänd pakettyp"
 
-#: ../util/errors.c:55
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "okänd version"
 
-#: ../util/errors.c:56
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "okänd algoritm för publik nyckel"
 
-#: ../util/errors.c:57
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "okänd sammandragsalgoritm"
 
-#: ../util/errors.c:58
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "felaktig publik nyckel"
 
-#: ../util/errors.c:59
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "felaktig hemlig nyckel"
 
-#: ../util/errors.c:60
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "felaktig signatur"
 
-#: ../util/errors.c:61
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "fel i kontrollsumma"
 
-#: ../util/errors.c:62
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "felaktig lösenfras"
 
-#: ../util/errors.c:63
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "publika nyckeln hittades inte"
 
-#: ../util/errors.c:64
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "okänd chifferalgoritm"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: ../util/errors.c:65
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "kan inte öppna nyckelringen"
 
-#: ../util/errors.c:66
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "ogiltigt paket"
 
-#: ../util/errors.c:67
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "ogiltigt ascii-skal"
 
-#: ../util/errors.c:68
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "inget sådan användaridentitet"
 
-#: ../util/errors.c:69
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "hemliga nyckeln är inte tillgänglig"
 
-#: ../util/errors.c:70
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "fel hemlig nyckel användes"
 
-#: ../util/errors.c:71
+#: util/errors.c:71
 msgid "not supported"
 msgstr "stöds inte"
 
-#: ../util/errors.c:72
+#: util/errors.c:72
 msgid "bad key"
 msgstr "felaktig nyckel"
 
-#: ../util/errors.c:73
+#: util/errors.c:73
 msgid "file read error"
 msgstr "fel vid läsning av fil"
 
-#: ../util/errors.c:74
+#: util/errors.c:74
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: ../util/errors.c:75
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "okänd komprimeringsalgoritm"
 
-#: ../util/errors.c:76
+#: util/errors.c:76
 msgid "file open error"
 msgstr "fel vid öppning av fil"
 
-#: ../util/errors.c:77
+#: util/errors.c:77
 msgid "file create error"
 msgstr "fel när filen skapades"
 
-#: ../util/errors.c:78
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "ogiltig lösenfras"
 
-#: ../util/errors.c:79
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "ej implementerad algoritm för publika nycklar"
 
-#: ../util/errors.c:80
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "ej implementerad algoritm för chiffer"
 
-#: ../util/errors.c:81
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "okänd signaturklass"
 
-#: ../util/errors.c:82
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "fel i tillitsdatabasen"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: ../util/errors.c:83
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "felaktig MPI"
 
-#: ../util/errors.c:84
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "resursbegränsning"
 
-#: ../util/errors.c:85
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "ogiltig nyckelring"
 
-#: ../util/errors.c:86
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "felaktigt certifikat"
 
-#: ../util/errors.c:87
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "felformaterad användaridentitet"
 
-#: ../util/errors.c:88
+#: util/errors.c:88
 msgid "file close error"
 msgstr "fel vid stängning av fil"
 
-#: ../util/errors.c:89
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "fel vid namnbyte av fil"
 
-#: ../util/errors.c:90
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "fel vid borttagning av fil"
 
-#: ../util/errors.c:91
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "oväntat data"
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: ../util/errors.c:92
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt i tidsstämpel"
 
-#: ../util/errors.c:93
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "oanvändbar algoritm för publika nycklar"
 
-#: ../util/errors.c:94
+#: util/errors.c:94
 msgid "file exists"
 msgstr "filen finns"
 
-#: ../util/errors.c:95
+#: util/errors.c:95
 msgid "weak key"
 msgstr "svag nyckel"
 
-#: ../util/errors.c:96
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "ogiltigt argument"
 
-#: ../util/errors.c:97
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "felaktig uri"
 
-#: ../util/errors.c:98
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "uri:n stöds inte"
 
-#: ../util/errors.c:99
+#: util/errors.c:99
 msgid "network error"
 msgstr "nätverksfel"
 
-#: ../util/errors.c:101
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "inte krypterad"
 
-#: ../util/errors.c:102
+#: util/errors.c:102
 msgid "not processed"
 msgstr "inte behandlad"
 
-#. the key cannot be used for a specific usage
-#: ../util/errors.c:104
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "oanvändbar publik nyckel"
 
-#: ../util/errors.c:105
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "oanvändbar hemlig nyckel"
 
-#: ../util/errors.c:106
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "nyckelserverfel"
 
-#: ../util/errors.c:107
+#: util/errors.c:107
 msgid "canceled"
 msgstr "avbruten"
 
-#: ../util/errors.c:108
+#: util/errors.c:108
 msgid "no card"
 msgstr "inget kort"
 
-#: ../util/errors.c:109
+#: util/errors.c:109
 msgid "no data"
 msgstr "inget data"
 
-#: ../util/logger.c:156
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "FEL: "
 
-#: ../util/logger.c:159
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "VARNING: "
 
-#: ../util/logger.c:222
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... det här är ett fel (%s:%d:%s)\n"
 
-#: ../util/logger.c:228
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../util/miscutil.c:328
-#: ../util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "ja"
 
-#: ../util/miscutil.c:329
-#: ../util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../util/miscutil.c:331
-#: ../util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "nej"
 
-#: ../util/miscutil.c:332
-#: ../util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "avsluta"
 
-#: ../util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okay|okej|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "avbryt|stoppa"
 
-#: ../util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: ../util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "aAsS"
 
-#: ../util/secmem.c:96
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "VARNING: använder osäkert minne!\n"
 
-#: ../util/secmem.c:97
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "se http://www.gnupg.org/faq.html för mer information\n"
 
-#: ../util/secmem.c:355
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "åtgärden är inte möjlig utan initierat säkert minne\n"
 
-#: ../util/secmem.c:356
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kanske använder fel program för den här uppgiften)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN-kod"
diff --git a/po/tr.po b/po/tr.po
index 8c6442e61..c44d8f407 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -39,13 +39,12 @@ msgstr "`%s' kiltlenemedi\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -77,9 +76,10 @@ msgstr "\"%s\" okunamıyor: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -133,172 +133,218 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "anahtar okuması başarısız\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1494
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1501
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1516
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [yapılan imza: %lu]"
+
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "PIN [yapılan imza: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: g10/app-openpgp.c:1334
+#: g10/app-openpgp.c:1662
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|Yönetici PIN'i"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "PIN [yapılan imza: %lu]"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "PIN [yapılan imza: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "gizli anahtar parçaları kullanım dışı\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: g10/app-openpgp.c:1490
+#: g10/app-openpgp.c:2061
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: g10/app-openpgp.c:1494
+#: g10/app-openpgp.c:2065
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: g10/app-openpgp.c:1560
+#: g10/app-openpgp.c:2187
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: g10/app-openpgp.c:1564
+#: g10/app-openpgp.c:2191
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:2193
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: g10/app-openpgp.c:1733
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "yeni anahtar üretiliyor\n"
+
+#: g10/app-openpgp.c:2620
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:2640
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1747
+#: g10/app-openpgp.c:2652
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1825
+#: g10/app-openpgp.c:2766
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/app-openpgp.c:1884
+#: g10/app-openpgp.c:2852
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: g10/app-openpgp.c:1899
+#: g10/app-openpgp.c:2865
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: g10/app-openpgp.c:1902
+#: g10/app-openpgp.c:2868
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: g10/app-openpgp.c:1959
+#: g10/app-openpgp.c:2926
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2085
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/app-openpgp.c:2132
+#: g10/app-openpgp.c:3168
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/app-openpgp.c:2140
-#, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [yapılan imza: %lu]"
-
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -383,163 +429,225 @@ msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "%s kipindeyken bu komut kullanılamaz.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "`%s' oluşturulurken hata: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "%u bite yuvarlandı\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -550,139 +658,148 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "PIN değiştirmek için menü"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "gizli anahtar kullanışsız"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -692,36 +809,36 @@ msgstr ""
 "   %.*s\n"
 "olan kartı yerleştirin.\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "Yeni Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "Yeni PIN'i girin: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "PIN'i girin: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "Bu PIN'i tekrarlayın: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -730,13 +847,13 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -839,7 +956,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@ -1234,7 +1351,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "Şifre: "
 
@@ -1242,7 +1359,7 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
@@ -1379,402 +1496,402 @@ msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
-msgid "show user-supplied notations during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2666
-#, fuzzy
-msgid "show preferred keyserver URLs during signature verification"
-msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
-
-#: g10/gpg.c:2668
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "'%s' geçerli bir karakter kümesi değil\n"
-
 #: g10/gpg.c:2670
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show user-supplied notations during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2672
 #, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
+
+#: g10/gpg.c:2674
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "'%s' geçerli bir karakter kümesi değil\n"
+
+#: g10/gpg.c:2676
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2678
+#, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
@@ -1819,18 +1936,18 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
@@ -1856,8 +1973,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
@@ -2657,12 +2775,12 @@ msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
@@ -2711,7 +2829,7 @@ msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2722,12 +2840,12 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
@@ -2945,8 +3063,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -2957,19 +3075,19 @@ msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -2986,7 +3104,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -3319,117 +3437,117 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 #, fuzzy
 msgid "Notations: "
 msgstr "Niteleme: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3437,17 +3555,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3456,7 +3574,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3465,75 +3583,75 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3543,266 +3661,267 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "Şifreleme"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "Kimlik kanıtlama"
 
@@ -3815,109 +3934,104 @@ msgstr "Kimlik kanıtlama"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA anahtar çifti %u bit olacak.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "%u bite yuvarlandı\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3933,7 +4047,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3949,38 +4063,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3988,11 +4102,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4008,44 +4122,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4056,7 +4170,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4072,24 +4186,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4097,12 +4211,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4114,7 +4228,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4127,50 +4241,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4178,19 +4292,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4198,26 +4312,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4250,246 +4364,246 @@ msgstr "imza niteleyici: "
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "%s' anahtar zinciri arabellekleniyor\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
@@ -4647,62 +4761,62 @@ msgstr "\"%s\" deki imza iyi"
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -4741,59 +4855,64 @@ msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " b = Daha fazla bilgi gerekli\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -4846,11 +4965,11 @@ msgstr "dizin `%s' oluşturuldu\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -4936,7 +5055,7 @@ msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4950,58 +5069,58 @@ msgstr ""
 "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
 "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N)  "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç)? "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
@@ -5021,45 +5140,45 @@ msgstr "bBmMaAkK"
 msgid "No trust value assigned to:\n"
 msgstr "Güven değeri belirtilmemiş:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  namı-diğer \"%s\"\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = bilmiyorum, kem küm\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = güvence vermem\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Son derece güveniyorum\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr " m = ana menüye dön\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr " ç = çık\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5068,43 +5187,43 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "Kararınız? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz?  (e/H ya da "
 "y/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
 "belirti yok\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
 "bir belirti var\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5114,110 +5233,110 @@ msgstr ""
 "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
 "sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5225,33 +5344,33 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
@@ -5318,7 +5437,7 @@ msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
@@ -5342,11 +5461,11 @@ msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
@@ -5365,30 +5484,30 @@ msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5406,34 +5525,34 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
@@ -5512,24 +5631,24 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5537,25 +5656,25 @@ msgstr ""
 "anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -5695,12 +5814,12 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
@@ -5744,85 +5863,85 @@ msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: güvence veritabanı oluşturuldu\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5869,122 +5988,130 @@ msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[süresi doldu] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[bilinmeyen]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[tanımsız]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[şöyle böyle]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[tamamen]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[son derece]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5992,7 +6119,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6253,47 +6380,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "evet"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "hayır"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "hH"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "çık"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "çÇ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "tamam|tamam"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "iptal|iptal"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "tT"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "iİ"
 
@@ -6315,6 +6442,16 @@ msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA anahtar çifti %u bit olacak.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr ""
+#~ "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Yönetici PIN'i"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c214625c..5d930e030 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.7\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2007-11-26 13:41+0800\n"
 "Last-Translator: Meng Jie <zuxy.meng@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -44,13 +44,12 @@ msgstr "无法锁定‘%s’：%s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "等待‘%s’上的锁\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -82,9 +81,10 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -137,171 +137,217 @@ msgstr ""
 "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n"
 "(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN 回调返回错误：%s\n"
-
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
-
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "验证 CHV%d 失败：%s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "尚未配置管理员命令的权限\n"
-
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "从智能卡中获取 CHV 状态时出错\n"
-
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "智能卡被永久锁定！\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "尝试管理员 PIN %d 次后，智能卡将被永久锁定！\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|管理员 PIN"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|新的管理员 PIN"
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "新的 PIN"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "获取新 PIN 时出错：%s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "读取应用程序数据时出错\n"
-
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "读取指纹 D0 出错\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "密钥已存在\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "现有的密钥将被替换\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "生成新密钥\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "缺少创建时间戳\n"
-
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 余数缺失或者不是 %d 位长\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "无法存储密钥：%s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "请稍候，正在生成密钥……\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "生成密钥失败\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "密钥已生成(耗时 %d 秒)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "智能卡不支持散列算法 %s\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "目前已创建的签名：%lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: g10/app-openpgp.c:2442
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN 回调返回错误：%s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "验证 CHV%d 失败：%s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "从智能卡中获取 CHV 状态时出错\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "智能卡被永久锁定！\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "尝试管理员 PIN %d 次后，智能卡将被永久锁定！\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "尚未配置管理员命令的权限\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "私钥部分不可用\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "请选择吊销的原因：\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|新的管理员 PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "新的 PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "读取应用程序数据时出错\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "读取指纹 D0 出错\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "密钥已存在\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "现有的密钥将被替换\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "生成新密钥\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "生成新密钥\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "缺少创建时间戳\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA 余数缺失或者不是 %d 位长\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA 公钥指数缺失或长于 %d 位\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "无法存储密钥：%s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "请稍候，正在生成密钥……\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "生成密钥失败\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "密钥已生成(耗时 %d 秒)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "智能卡不支持散列算法 %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "目前已创建的签名：%lu\n"
+
+#: g10/app-openpgp.c:3497
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -384,163 +430,225 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "在 %s 模式中不允许使用这个指令。\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "智能卡持有人的姓："
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "智能卡持有人的名："
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "建立‘%s’时发生错误：%s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "您想要用多大的密钥尺寸？(%u)"
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "您想要用多大的密钥尺寸？(%u)"
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "您想要用多大的密钥尺寸？(%u)"
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "舍入到 %u 位\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "读取私钥区块“%s”时出错：%s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建智能卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "私钥已存储在智能卡上\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -551,137 +659,146 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在智能卡上\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "更改智能卡持有人的姓名"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "根据智能卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "更改智能卡持有人的性别"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "读卡器不可用\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入智能卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "选择 OpenPGP 时失败：%s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -690,36 +807,36 @@ msgstr ""
 "请取出当前的智能卡，并插入有下列序列号的智能卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "输入新的管理员 PIN："
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "输入新的 PIN："
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
 #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -728,13 +845,13 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
 #: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -830,7 +947,7 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -1219,7 +1336,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -1227,7 +1344,7 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "压缩："
 
@@ -1360,397 +1477,397 @@ msgstr "列出签名时显示过期日期"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr "在签名验证中只显示主用户标识"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意：%s 本版本中不可用\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
@@ -1794,17 +1911,17 @@ msgstr "自动获取‘%s’，通过 %s\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -1830,8 +1947,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "语法：gpg [选项] [文件]\n"
@@ -2601,12 +2719,12 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
@@ -2655,7 +2773,7 @@ msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2666,12 +2784,12 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
@@ -2878,8 +2996,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -2888,19 +3006,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在智能卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在智能卡上。\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -2917,7 +3035,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -3226,136 +3344,136 @@ msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3364,74 +3482,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”无用部分被清除：%s\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "用户标识“%s”：%d 个签名被清除\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "用户标识“%s”：%d 个签名被清除\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：已经最小化\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3440,255 +3558,256 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  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:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  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:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3460
+#: g10/keyedit.c:3462
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "认证"
 
@@ -3701,109 +3820,104 @@ msgstr "认证"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA 和 ElGamal (默认)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (自定义用途)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (仅用于加密)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (仅用于加密)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (自定义用途)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA 密钥对会有 %u 位。\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "您想要用多大的密钥尺寸？(%u)"
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "舍入到 %u 位\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3819,7 +3933,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3835,38 +3949,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3874,11 +3988,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3894,44 +4008,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3942,7 +4056,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3957,23 +4071,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3981,12 +4095,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -3998,7 +4112,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4008,50 +4122,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4059,42 +4173,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向智能卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：智能卡密钥的备份已保存到‘%s’\n"
@@ -4127,246 +4241,246 @@ msgstr "签名注记："
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "在搜索结果中包含已吊销的密钥"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "按钥匙号搜索时包含子钥"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "不删除使用过的临时文件"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "验证签名时自动下载密钥"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "使用密钥中指定的首选公钥服务器 URL"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "获取密钥时使用密钥上的 PKA 记录"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
@@ -4518,62 +4632,62 @@ msgstr "完好的签名，来自于“%s”"
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2048
+#: g10/mainproc.c:2049
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -4612,59 +4726,64 @@ msgstr "警告：使用试验性质的对称加密算法 %s\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告：不建议使用散列算法 %s\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "警告：不建议使用散列算法 %s\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "注意：%s 本版本中不可用\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "不压缩"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -4716,11 +4835,11 @@ msgstr "已创建目录‘%s’\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
@@ -4804,7 +4923,7 @@ msgstr "         (主钥 %s 的子钥)"
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4817,58 +4936,58 @@ msgstr ""
 "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
 "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作相片标识的JPEG文件名： "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N)"
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "“%s”不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q)"
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr "没有设置照片查看程序\n"
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
@@ -4889,44 +5008,44 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "下列项目没有指定信任度：\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = 我不知道或我不作答\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我不相信\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我绝对相信\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = 回到主菜单\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  q = 退出\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4935,37 +5054,37 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被绝对信任的密钥的证书：\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "这把密钥有可能属于它所声称的持有者\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "这把密钥是属于我们的\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -4974,105 +5093,105 @@ msgstr ""
 "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
 "己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不被信任的密钥！\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      这表明这个签名有可能是伪造的。\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "注意：验证过的签名者的地址是‘%s’\n"
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "PKA 信息有效，信任级别调整到“完全”\n"
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "PKA 信息无效，信任级别调整到“从不”\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
-#: g10/pkclist.c:605
+#: g10/pkclist.c:606
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签名很有可能是伪造的。\n"
 
-#: g10/pkclist.c:622
+#: g10/pkclist.c:623
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5080,33 +5199,33 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
@@ -5173,7 +5292,7 @@ msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -5195,11 +5314,11 @@ msgstr "(这是一把敏感的吊销密钥)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
@@ -5218,28 +5337,28 @@ msgstr "没有找到“%s”的吊销密钥\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5257,33 +5376,33 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
@@ -5355,44 +5474,44 @@ msgstr "警告：签名的子钥 %s 未经交叉验证\n"
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子钥 %s 交叉验证无效\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
@@ -5520,12 +5639,12 @@ msgstr "读取‘%s’错误：%s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
@@ -5569,84 +5688,85 @@ msgstr "%s：建立了无效的信任度数据库\n"
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s：建立了信任度数据库\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5693,127 +5813,135 @@ msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -6072,47 +6200,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okay|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6132,6 +6260,15 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA 密钥对会有 %u 位。\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|管理员 PIN"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d01844c32..038abdd31 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.9\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2008-03-25 09:52+0100\n"
+"POT-Creation-Date: 2009-08-13 09:26+0200\n"
 "PO-Revision-Date: 2008-03-27 09:51+0800\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -45,29 +45,12 @@ msgstr "無法鎖定 `%s': %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: cipher/random.c:446
-#: g10/card-util.c:681
-#: g10/card-util.c:750
-#: g10/dearmor.c:59
-#: g10/dearmor.c:108
-#: g10/encode.c:182
-#: g10/encode.c:472
-#: g10/gpg.c:1015
-#: g10/gpg.c:3605
-#: g10/import.c:193
-#: g10/keygen.c:2403
-#: g10/keyring.c:1523
-#: g10/openfile.c:188
-#: g10/openfile.c:356
-#: g10/plaintext.c:490
-#: g10/sign.c:776
-#: g10/sign.c:969
-#: g10/sign.c:1083
-#: g10/sign.c:1234
-#: g10/tdbdump.c:139
-#: g10/tdbdump.c:147
-#: g10/tdbio.c:538
-#: g10/tdbio.c:603
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -99,24 +82,15 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未更新\n"
 
-#: cipher/random.c:542
-#: g10/exec.c:479
-#: g10/gpg.c:1014
-#: g10/keygen.c:2889
-#: g10/keygen.c:2919
-#: g10/keyring.c:1199
-#: g10/keyring.c:1499
-#: g10/openfile.c:277
-#: g10/openfile.c:371
-#: g10/sign.c:794
-#: g10/sign.c:1099
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
 #: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:554
-#: cipher/random.c:564
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
@@ -164,186 +138,217 @@ msgstr ""
 "隨機位元組不夠多. 請多做一些有的沒的事情, \n"
 "這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
 
-#: g10/app-openpgp.c:594
+#: g10/app-openpgp.c:697
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: g10/app-openpgp.c:607
+#: g10/app-openpgp.c:710
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: g10/app-openpgp.c:975
+#: g10/app-openpgp.c:1149
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: g10/app-openpgp.c:983
-#: g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: g10/app-openpgp.c:991
-#: g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: g10/app-openpgp.c:1000
-#: g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: g10/app-openpgp.c:1256
-#: g10/app-openpgp.c:1344
-#: g10/app-openpgp.c:2152
-#, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
-
-#: g10/app-openpgp.c:1262
-#: g10/app-openpgp.c:1350
-#: g10/app-openpgp.c:2158
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
-
-#: g10/app-openpgp.c:1271
-#: g10/app-openpgp.c:1285
-#: g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167
-#: g10/app-openpgp.c:2181
-#, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "驗證 CHV%d 失敗: %s\n"
-
-#: g10/app-openpgp.c:1308
-msgid "access to admin commands is not configured\n"
-msgstr "管理者指令存取權限尚未組態\n"
-
-#: g10/app-openpgp.c:1323
-#: g10/app-openpgp.c:2428
-msgid "error retrieving CHV status from card\n"
-msgstr "從卡片取回 CHV 狀態時出錯\n"
-
-#: g10/app-openpgp.c:1329
-#: g10/app-openpgp.c:2437
-msgid "card is permanently locked!\n"
-msgstr "卡片永久鎖定了!!\n"
-
-#: g10/app-openpgp.c:1334
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\n"
-
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1341
-msgid "|A|Admin PIN"
-msgstr "|A|管理者 PIN"
-
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1490
-msgid "|AN|New Admin PIN"
-msgstr "|AN|新增管理者 PIN"
-
-#: g10/app-openpgp.c:1490
-msgid "|N|New PIN"
-msgstr "|N|新增 PIN"
-
 #: g10/app-openpgp.c:1494
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+msgid "using default PIN as %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1544
-#: g10/app-openpgp.c:1994
-msgid "error reading application data\n"
-msgstr "讀取應用程式資料時出錯\n"
-
-#: g10/app-openpgp.c:1550
-#: g10/app-openpgp.c:2001
-msgid "error reading fingerprint DO\n"
-msgstr "讀取指紋 DO 時出錯\n"
-
-#: g10/app-openpgp.c:1560
-msgid "key already exists\n"
-msgstr "金鑰已存在\n"
-
-#: g10/app-openpgp.c:1564
-msgid "existing key will be replaced\n"
-msgstr "既有的金鑰將被取代\n"
-
-#: g10/app-openpgp.c:1566
-msgid "generating new key\n"
-msgstr "正在產生新的金鑰\n"
-
-#: g10/app-openpgp.c:1733
-msgid "creation timestamp missing\n"
-msgstr "缺漏創生時間戳印\n"
-
-#: g10/app-openpgp.c:1740
+#: g10/app-openpgp.c:1501
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1747
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
-
-#: g10/app-openpgp.c:1755
-#: g10/app-openpgp.c:1762
-#, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
-
-#: g10/app-openpgp.c:1825
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "存放金鑰失敗: %s\n"
-
-#: g10/app-openpgp.c:1884
-msgid "please wait while key is being generated ...\n"
-msgstr "正在產生金鑰中, 請稍候 ...\n"
-
-#: g10/app-openpgp.c:1899
-msgid "generating key failed\n"
-msgstr "產生金鑰時失敗\n"
-
-#: g10/app-openpgp.c:1902
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "金鑰產生完畢 (%d 秒)\n"
-
-#: g10/app-openpgp.c:1959
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
-
-#: g10/app-openpgp.c:2085
-#, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "卡片不支援 %s 摘要演算法\n"
-
-#: g10/app-openpgp.c:2132
-#, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "目前建立的簽章: %lu\n"
-
-#: g10/app-openpgp.c:2140
+#: g10/app-openpgp.c:1516
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: g10/app-openpgp.c:2442
-msgid "verification of Admin PIN is currently prohibited through this command\n"
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
+
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
+
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "驗證 CHV%d 失敗: %s\n"
+
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483
+msgid "error retrieving CHV status from card\n"
+msgstr "從卡片取回 CHV 狀態時出錯\n"
+
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492
+msgid "card is permanently locked!\n"
+msgstr "卡片永久鎖定了!!\n"
+
+#: g10/app-openpgp.c:1662
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1669
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: g10/app-openpgp.c:1673
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: g10/app-openpgp.c:1694
+msgid "access to admin commands is not configured\n"
+msgstr "管理者指令存取權限尚未組態\n"
+
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "私鑰部分無法取用\n"
+
+#: g10/app-openpgp.c:2028
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "請選擇撤銷的原因:\n"
+
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
+
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|新增管理者 PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|新增 PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "讀取應用程式資料時出錯\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "讀取指紋 DO 時出錯\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "金鑰已存在\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "既有的金鑰將被取代\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "正在產生新的金鑰\n"
+
+#: g10/app-openpgp.c:2195
+#, fuzzy
+msgid "writing new key\n"
+msgstr "正在產生新的金鑰\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "缺漏創生時間戳印\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "存放金鑰失敗: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "正在產生金鑰中, 請稍候 ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "產生金鑰時失敗\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "金鑰產生完畢 (%d 秒)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "卡片不支援 %s 摘要演算法\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "目前建立的簽章: %lu\n"
+
+#: g10/app-openpgp.c:3497
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者個人識別碼 (PIN) 驗證被禁止了\n"
 
-#: g10/app-openpgp.c:2513
-#: g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -381,8 +386,7 @@ msgstr "未預期的封裝: "
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:813
-#: g10/armor.c:1423
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 已跳過\n"
@@ -399,8 +403,7 @@ msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:902
-#: g10/armor.c:1460
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
@@ -423,181 +426,229 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
 #: g10/armor.c:1246
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:61
-#: g10/card-util.c:309
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:66
+#: g10/card-util.c:90
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:74
-#: g10/card-util.c:1409
-#: g10/delkey.c:126
-#: g10/keyedit.c:1516
-#: g10/keygen.c:2587
-#: g10/revoke.c:216
-#: g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:101
-#: g10/card-util.c:1135
-#: g10/card-util.c:1218
-#: g10/keyedit.c:423
-#: g10/keyedit.c:444
-#: g10/keyedit.c:458
-#: g10/keygen.c:1400
-#: g10/keygen.c:1467
+#: g10/card-util.c:106
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "在 %s 模式中不允許使用這個指令.\n"
+
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
+#: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:219
-#: g10/card-util.c:269
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:416
+#: g10/card-util.c:509
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:417
+#: g10/card-util.c:510
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:444
+#: g10/card-util.c:537
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:628
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:630
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:526
+#: g10/card-util.c:632
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:649
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:545
+#: g10/card-util.c:651
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:563
+#: g10/card-util.c:669
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:584
+#: g10/card-util.c:690
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:592
+#: g10/card-util.c:698
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:690
-#: g10/card-util.c:759
-#: g10/import.c:279
+#: g10/card-util.c:791
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
+
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
 
-#: g10/card-util.c:698
+#: g10/card-util.c:836
+#, fuzzy, c-format
+msgid "error writing `%s': %s\n"
+msgstr "建立 `%s' 時出錯: %s\n"
+
+#: g10/card-util.c:863
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:708
+#: g10/card-util.c:873
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:909
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:777
+#: g10/card-util.c:919
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:797
+#: g10/card-util.c:1002
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:805
+#: g10/card-util.c:1010
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:814
+#: g10/card-util.c:1019
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:835
+#: g10/card-util.c:1041
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)男性, (F)女性或留空): "
 
-#: g10/card-util.c:849
+#: g10/card-util.c:1055
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:870
+#: g10/card-util.c:1077
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:893
+#: g10/card-util.c:1100
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:941
+#: g10/card-util.c:1150
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:942
+#: g10/card-util.c:1151
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:951
+#: g10/card-util.c:1164
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1036
+#: g10/card-util.c:1251
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1057
-#: g10/card-util.c:1066
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+"      If the key generation does not succeed, please check the\n"
+"      documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "妳想要用多大的金鑰尺寸? (%u) "
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "妳想要用多大的金鑰尺寸? (%u) "
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "妳想要用多大的金鑰尺寸? (%u) "
+
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "加大到 %u 位元\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1635
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
+
+#: g10/card-util.c:1361
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1078
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "私鑰已經存放在卡片上了\n"
+
+#: g10/card-util.c:1378
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1390
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -608,149 +659,146 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1126
+#: g10/card-util.c:1446
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1128
-#: g10/card-util.c:1209
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1129
-#: g10/card-util.c:1211
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1130
-#: g10/card-util.c:1213
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1146
-#: g10/card-util.c:1229
-#: g10/keyedit.c:938
-#: g10/keygen.c:1404
-#: g10/keygen.c:1432
-#: g10/keygen.c:1506
-#: g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1206
+#: g10/card-util.c:1553
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1597
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1246
+#: g10/card-util.c:1602
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1251
+#: g10/card-util.c:1607
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1322
-#: g10/keyedit.c:1349
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1681
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1325
-#: g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1684
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1687
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1688
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1689
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1690
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1691
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1692
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1693
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1694
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1695
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1339
+#: g10/card-util.c:1696
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1340
+#: g10/card-util.c:1697
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1460
-#: g10/keyedit.c:1619
+#: g10/card-util.c:1698
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1498
+#: g10/card-util.c:1861
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1529
+#: g10/card-util.c:1892
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1531
+#: g10/card-util.c:1894
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1605
-#: g10/keyedit.c:2240
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:414
+#: g10/cardglue.c:457
 msgid "card reader not available\n"
 msgstr "沒有讀卡機可用\n"
 
-#: g10/cardglue.c:432
+#: g10/cardglue.c:475
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 取消: "
 
-#: g10/cardglue.c:444
+#: g10/cardglue.c:487
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "挑選 openpgp 時失敗: %s\n"
 
-#: g10/cardglue.c:571
+#: g10/cardglue.c:614
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -759,71 +807,57 @@ msgstr ""
 "請移除現用中的卡片並插入下列序號的卡片:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:623
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "準備好時請按下 [Enter], 或者輸入 'c' 取消: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:1013
 msgid "Enter New Admin PIN: "
 msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:1014
 msgid "Enter New PIN: "
 msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:1015
 msgid "Enter Admin PIN: "
 msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:1016
 msgid "Enter PIN: "
 msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:1033
 msgid "Repeat this PIN: "
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:1048
 msgid "PIN not correctly repeated; try again"
 msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 
-#: g10/decrypt.c:67
-#: g10/decrypt.c:158
-#: g10/gpg.c:3970
-#: g10/keyring.c:375
-#: g10/keyring.c:661
-#: g10/verify.c:101
-#: g10/verify.c:156
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:103
-#: g10/encode.c:823
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/delkey.c:73
-#: g10/export.c:309
-#: g10/keyedit.c:3388
-#: g10/keyserver.c:1711
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81
-#: g10/export.c:339
-#: g10/import.c:2378
-#: g10/keyserver.c:1725
-#: g10/revoke.c:232
-#: g10/revoke.c:476
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時出錯: %s\n"
 
-#: g10/delkey.c:127
-#: g10/delkey.c:134
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非妳用指紋指定了金鑰)\n"
 
@@ -857,8 +891,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:211
-#: g10/sign.c:1254
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
@@ -872,15 +905,12 @@ msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encode.c:239
-#: g10/encode.c:534
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:290
-#: g10/encode.c:568
-#: g10/sign.c:559
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是個空檔案\n"
@@ -895,18 +925,21 @@ msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
 #: g10/encode.c:506
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:516
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:612
-#: g10/sign.c:931
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:699
@@ -914,9 +947,7 @@ msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:769
-#: g10/pkclist.c:804
-#: g10/pkclist.c:852
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
@@ -926,20 +957,19 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encr-data.c:89
-#: g10/mainproc.c:296
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/encr-data.c:91
-#: g10/mainproc.c:300
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
 #: g10/encr-data.c:115
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:126
@@ -950,14 +980,14 @@ msgstr "處理已加密封包有問題\n"
 msgid "no remote program execution supported\n"
 msgstr "沒有支援的遠端程式執行\n"
 
-#: g10/exec.c:174
-#: g10/openfile.c:429
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
 #: g10/exec.c:315
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
 #: g10/exec.c:345
@@ -979,8 +1009,7 @@ msgstr "無法執行 shell `%s': %s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:522
-#: g10/exec.c:588
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
@@ -993,8 +1022,7 @@ msgstr "無法執行外部程式\n"
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:599
-#: g10/exec.c:606
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
@@ -1194,8 +1222,7 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:444
-#: g10/gpgv.c:68
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1229,8 +1256,7 @@ msgstr "使用標準的文字模式"
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:481
-#: g10/gpgv.c:70
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -1278,10 +1304,10 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:769
-#: g10/gpgv.c:95
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
+msgstr ""
+"請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
 #: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
@@ -1309,8 +1335,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:809
-#: g10/keyedit.c:2306
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1318,8 +1343,7 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:821
-#: g10/keyedit.c:2352
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -1373,7 +1397,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1294
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1297
@@ -1388,7 +1413,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1306
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1309
@@ -1450,404 +1476,397 @@ msgstr "列出簽章時顯示有效期限"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2071
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: g10/gpg.c:2286
-#: g10/gpg.c:2955
-#: g10/gpg.c:2974
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2299
+#: g10/gpg.c:2305
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未載入\n"
 
-#: g10/gpg.c:2488
-#: g10/gpg.c:2500
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2583
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2601
-#: g10/gpg.c:2790
-#: g10/keyedit.c:4076
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2862
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2865
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2942
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2946
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2955
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:2958
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2967
+#: g10/gpg.c:2965
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "請注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:2980
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2996
+#: g10/gpg.c:2994
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3000
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3006
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3088
-#: g10/gpg.c:3112
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3094
-#: g10/gpg.c:3118
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3099
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3106
+#: g10/gpg.c:3105
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3120
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3122
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3124
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3127
+#: g10/gpg.c:3126
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3128
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3131
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3135
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3142
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3152
+#: g10/gpg.c:3151
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3156
+#: g10/gpg.c:3155
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3159
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3193
+#: g10/gpg.c:3192
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3239
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3244
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3249
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3354
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3365
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3374
+#: g10/gpg.c:3376
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3383
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3385
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3393
+#: g10/gpg.c:3395
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3408
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3410
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3413
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3431
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3444
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3459
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3459
+#: g10/gpg.c:3461
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3462
+#: g10/gpg.c:3464
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3484
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3491
+#: g10/gpg.c:3493
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3518
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3524
+#: g10/gpg.c:3526
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3530
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3551
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3620
+#: g10/gpg.c:3622
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3666
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3668
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3677
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3687
+#: g10/gpg.c:3689
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3738
+#: g10/gpg.c:3740
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3746
+#: g10/gpg.c:3748
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3835
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
@@ -1880,10 +1899,7 @@ msgstr "pk 快取裡有太多項目 - 已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:946
-#: g10/getkey.c:956
-#: g10/getkey.c:966
-#: g10/getkey.c:982
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
 #: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
@@ -1894,18 +1910,17 @@ msgstr "已自動取回 `%s' (經由 %s )\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2389
-#: g10/keyedit.c:3719
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2620
+#: g10/getkey.c:2656
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2667
+#: g10/getkey.c:2703
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
@@ -1931,8 +1946,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
 #: g10/gpgv.c:102
+#, fuzzy
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "語法: gpg [選項] [檔案]\n"
@@ -1963,7 +1979,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何都想要用這把未被信任的金鑰, 請回答 \"yes\"."
 
 #: g10/helptext.c:64
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
 #: g10/helptext.c:68
@@ -2004,13 +2021,8 @@ msgstr ""
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰尺寸"
 
-#: g10/helptext.c:93
-#: g10/helptext.c:98
-#: g10/helptext.c:110
-#: g10/helptext.c:142
-#: g10/helptext.c:170
-#: g10/helptext.c:175
-#: g10/helptext.c:180
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
@@ -2061,26 +2073,36 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -2403,8 +2425,7 @@ msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719
-#: g10/import.c:1117
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
@@ -2428,8 +2449,7 @@ msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:781
-#: g10/import.c:1239
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
@@ -2444,20 +2464,13 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:801
-#: g10/openfile.c:281
-#: g10/sign.c:799
-#: g10/sign.c:1104
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "寫入 `%s' 中\n"
 
-#: g10/import.c:805
-#: g10/import.c:900
-#: g10/import.c:1157
-#: g10/import.c:1300
-#: g10/import.c:2392
-#: g10/import.c:2414
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2392 g10/import.c:2414
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
@@ -2472,14 +2485,12 @@ msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:865
-#: g10/import.c:1257
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:873
-#: g10/import.c:1264
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
@@ -2548,8 +2559,7 @@ msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:1151
-#: g10/import.c:2407
+#: g10/import.c:1151 g10/import.c:2407
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -2604,8 +2614,7 @@ msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 
-#: g10/import.c:1419
-#: g10/import.c:1469
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
@@ -2721,13 +2730,12 @@ msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' 鑰匙圈已建立\n"
 
-#: g10/keydb.c:314
-#: g10/keydb.c:317
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' 金鑰區塊資源: %s\n"
 
-#: g10/keydb.c:696
+#: g10/keydb.c:701
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
@@ -2740,35 +2748,29 @@ msgstr "[撤銷]"
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:343
-#: g10/keylist.c:388
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 份損壞的簽章\n"
 
-#: g10/keyedit.c:345
-#: g10/keylist.c:390
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 份損壞的簽章\n"
 
-#: g10/keyedit.c:347
-#: g10/keylist.c:392
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:349
-#: g10/keylist.c:394
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351
-#: g10/keylist.c:396
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因錯誤而未被檢查\n"
 
-#: g10/keyedit.c:353
-#: g10/keylist.c:398
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因錯誤而未被檢查\n"
@@ -2782,23 +2784,22 @@ msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:413
-#: g10/pkclist.c:264
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:417
-#: g10/pkclist.c:276
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:418
-#: g10/pkclist.c:278
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
@@ -2822,19 +2823,12 @@ msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
 
-#: g10/keyedit.c:607
-#: g10/keyedit.c:635
-#: g10/keyedit.c:662
-#: g10/keyedit.c:828
-#: g10/keyedit.c:888
-#: g10/keyedit.c:1738
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:621
-#: g10/keyedit.c:649
-#: g10/keyedit.c:676
-#: g10/keyedit.c:834
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
 #: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
@@ -2930,7 +2924,9 @@ msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
 #: g10/keyedit.c:881
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
 #: g10/keyedit.c:883
@@ -2939,7 +2935,8 @@ msgstr "這會讓這把金鑰在 PGP 2.x 模式下無法使用.\n"
 
 #: g10/keyedit.c:908
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
@@ -3014,12 +3011,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1059
-#: g10/keyedit.c:4795
-#: g10/keyedit.c:4886
-#: g10/keyedit.c:4950
-#: g10/keyedit.c:5011
-#: g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
+#: g10/keyedit.c:5019 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -3028,24 +3021,19 @@ msgstr "簽署時失敗: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1135
-#: g10/keygen.c:3226
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1139
-#: g10/keygen.c:3214
-#: g10/revoke.c:537
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1143
-#: g10/keygen.c:3229
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1147
-#: g10/keygen.c:3233
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3062,8 +3050,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1186
-#: g10/keygen.c:1906
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3254,7 +3241,8 @@ msgstr "請先使用 \"toggle\" 指令.\n"
 
 #: g10/keyedit.c:1692
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
@@ -3284,9 +3272,7 @@ msgstr "未知的 `%s' 簽章種類\n"
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1812
-#: g10/keyedit.c:1832
-#: g10/keyedit.c:1998
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
@@ -3372,136 +3358,115 @@ msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2201
+#: g10/keyedit.c:2203
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2206
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2214
+#: g10/keyedit.c:2216
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2223
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2230
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2329
+#: g10/keyedit.c:2331
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2381
+#: g10/keyedit.c:2383
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2392
+#: g10/keyedit.c:2394
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2407
-#: g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2415
-#: g10/keyedit.c:2416
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:2626
+#: g10/keyedit.c:2628
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:2685
+#: g10/keyedit.c:2687
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:2706
+#: g10/keyedit.c:2708
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:2712
+#: g10/keyedit.c:2714
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2728
-#: g10/keyedit.c:2784
-#: g10/keyedit.c:2845
-#: g10/keyedit.c:2860
-#: g10/keylist.c:192
-#: g10/keyserver.c:517
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2731
-#: g10/keylist.c:769
-#: g10/keylist.c:863
-#: g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2733
-#: g10/keylist.c:740
-#: g10/keylist.c:775
-#: g10/keylist.c:869
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2735
-#: g10/keyedit.c:2786
-#: g10/keyedit.c:2847
-#: g10/keyedit.c:2862
-#: g10/keylist.c:194
-#: g10/keylist.c:746
-#: g10/keylist.c:781
-#: g10/keylist.c:875
-#: g10/keylist.c:896
-#: g10/keyserver.c:523
-#: g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2739
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2754
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2758
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2765
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2791
-#: g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2815
+#: g10/keyedit.c:2817
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3509,25 +3474,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2879
-#: g10/keyedit.c:3225
-#: g10/keyserver.c:527
-#: g10/mainproc.c:1815
-#: g10/trustdb.c:1177
-#: g10/trustdb.c:1697
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2881
-#: g10/keyedit.c:3227
-#: g10/keyserver.c:531
-#: g10/mainproc.c:1817
-#: g10/trustdb.c:530
-#: g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2948
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3535,349 +3492,338 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3009
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3012
-#: g10/keyedit.c:3347
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3018
+#: g10/keyedit.c:3020
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3158
+#: g10/keyedit.c:3160
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3168
+#: g10/keyedit.c:3170
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3180
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3195
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3198
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3229
-#: g10/trustdb.c:1701
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3233
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:3238
+#: g10/keyedit.c:3240
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3241
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3247
+#: g10/keyedit.c:3249
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:3248
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3344
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3353
+#: g10/keyedit.c:3355
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3375
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3400
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  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:3413
+#: g10/keyedit.c:3415
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3435
+#: g10/keyedit.c:3437
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:3454
+#: g10/keyedit.c:3456
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3460
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+#: g10/keyedit.c:3462
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3524
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3530
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把子鑰.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3586
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3602
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3680
+#: g10/keyedit.c:3687
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:3686
+#: g10/keyedit.c:3693
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:3848
+#: g10/keyedit.c:3856
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3887
-#: g10/keyedit.c:3997
-#: g10/keyedit.c:4117
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4058
+#: g10/keyedit.c:4066
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4138
+#: g10/keyedit.c:4146
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4139
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4209
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:4350
+#: g10/keyedit.c:4358
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:4414
+#: g10/keyedit.c:4422
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4480
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4499
+#: g10/keyedit.c:4507
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4642
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4637
-#: g10/keyedit.c:4701
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4639
-#: g10/keyedit.c:4703
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4651
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4655
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4659
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4686
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4712
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4711
+#: g10/keyedit.c:4719
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4733
+#: g10/keyedit.c:4741
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4753
+#: g10/keyedit.c:4761
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4791
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4853
+#: g10/keyedit.c:4861
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:4870
+#: g10/keyedit.c:4878
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4934
+#: g10/keyedit.c:4942
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:4996
+#: g10/keyedit.c:5004
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5091
+#: g10/keyedit.c:5099
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:263
+#: g10/keygen.c:266
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:270
+#: g10/keygen.c:273
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:275
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:277
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:417
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:898
 msgid "writing direct signature\n"
 msgstr "寫入直接簽章中\n"
 
-#: g10/keygen.c:913
+#: g10/keygen.c:938
 msgid "writing self signature\n"
 msgstr "寫入自我簽章中\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:989
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1026
-#: g10/keygen.c:1109
-#: g10/keygen.c:1114
-#: g10/keygen.c:1231
-#: g10/keygen.c:2787
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
+#: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1031
-#: g10/keygen.c:1120
-#: g10/keygen.c:1236
-#: g10/keygen.c:2793
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
+#: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1363
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1366
 msgid "Certify"
 msgstr "保證"
 
-#: g10/keygen.c:1335
+#: g10/keygen.c:1369
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1338
+#: g10/keygen.c:1372
 msgid "Authenticate"
 msgstr "鑑定"
 
@@ -3890,110 +3836,104 @@ msgstr "鑑定"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1355
+#: g10/keygen.c:1389
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1378
+#: g10/keygen.c:1412
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1416
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1387
+#: g10/keygen.c:1421
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1390
+#: g10/keygen.c:1424
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1393
+#: g10/keygen.c:1427
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1430
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1452
+#: g10/keygen.c:1490
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1454
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1492
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1494
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA 和 Elgamal (預設)\n"
+
+#: g10/keygen.c:1496
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1457
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (妳能自己設定性能)\n"
-
-#: g10/keygen.c:1459
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (僅能用於加密)\n"
-
-#: g10/keygen.c:1460
+#: g10/keygen.c:1497
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1501
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (僅能用於加密)\n"
+
+#: g10/keygen.c:1502
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:1464
+#: g10/keygen.c:1506
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (妳能自己設定性能)\n"
+
+#: g10/keygen.c:1507
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳能自己設定性能)\n"
 
-#: g10/keygen.c:1533
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA 金鑰對會有 %u 位元長.\n"
-
-#: g10/keygen.c:1543
+#: g10/keygen.c:1615
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1550
+#: g10/keygen.c:1623
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "妳想要用多大的金鑰尺寸? (%u) "
+
+#: g10/keygen.c:1626
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1564
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
-
-#: g10/keygen.c:1570
+#: g10/keygen.c:1641
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1575
-#: g10/keygen.c:1580
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "加大到 %u 位元\n"
-
-#: g10/keygen.c:1629
+#: g10/keygen.c:1721
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4009,7 +3949,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1732
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4025,38 +3965,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1753
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1758
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1691
+#: g10/keygen.c:1783
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1784
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1697
+#: g10/keygen.c:1789
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1790
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:1704
+#: g10/keygen.c:1794
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4064,14 +4004,15 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1709
+#: g10/keygen.c:1807
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1822
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -4082,44 +4023,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1835
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1745
+#: g10/keygen.c:1843
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1845
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1847
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1855
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1763
+#: g10/keygen.c:1861
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1771
+#: g10/keygen.c:1869
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1777
+#: g10/keygen.c:1875
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1898
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1806
+#: g10/keygen.c:1904
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4130,7 +4071,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1811
+#: g10/keygen.c:1909
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -4145,23 +4086,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1827
+#: g10/keygen.c:1925
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1935
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1838
+#: g10/keygen.c:1936
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1857
+#: g10/keygen.c:1955
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1995
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4169,13 +4110,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1907
-#: g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:2011
 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"
@@ -4187,7 +4127,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:2033
 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"
@@ -4198,53 +4138,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2733
+#: g10/keygen.c:2898
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:2932
-#: g10/keygen.c:3079
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:2934
-#: g10/keygen.c:3082
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2937
-#: g10/keygen.c:3085
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
 
-#: g10/keygen.c:3068
+#: g10/keygen.c:3254
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3074
+#: g10/keygen.c:3260
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3092
+#: g10/keygen.c:3278
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3285
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3308
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:3133
+#: g10/keygen.c:3319
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4252,56 +4189,47 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許妳會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3145
-#: g10/keygen.c:3274
-#: g10/keygen.c:3389
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3197
-#: g10/keygen.c:3324
-#: g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3199
-#: g10/keygen.c:3326
-#: g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3208
-#: g10/keygen.c:3337
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3247
-#: g10/keygen.c:3370
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3535
+#: g10/keygen.c:3731
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3778
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3608
+#: g10/keygen.c:3804
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:496
-#: g10/keyid.c:508
-#: g10/keyid.c:520
-#: g10/keyid.c:532
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "永遠不過期"
 
@@ -4329,251 +4257,246 @@ msgstr "簽章註記: "
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1503
+#: g10/keylist.c:1518
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1520
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1512
+#: g10/keylist.c:1527
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1514
+#: g10/keylist.c:1529
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1518
-#: g10/keylist.c:1522
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1589
+#: g10/keylist.c:1604
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1244
+#: g10/keyring.c:1256
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1286
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1287
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1288
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1289
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全漏洞\n"
 
-#: g10/keyring.c:1374
+#: g10/keyring.c:1389
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "快取鑰匙圈 `%s' 中\n"
 
-#: g10/keyring.c:1420
+#: g10/keyring.c:1448
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1432
+#: g10/keyring.c:1460
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1503
+#: g10/keyring.c:1531
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:67
+#: g10/keyserver.c:70
 msgid "include revoked keys in search results"
 msgstr "在搜尋結果中也包含已撤銷的金鑰"
 
-#: g10/keyserver.c:68
+#: g10/keyserver.c:71
 msgid "include subkeys when searching by key ID"
 msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:73
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr "用暫存檔來將資料遞送給金鑰伺服器協助程式"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
 msgid "do not delete temporary files after using them"
 msgstr "使用暫存檔後不要加以刪除"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "驗證簽章時自動取回金鑰"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:81
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
 
-#: g10/keyserver.c:146
+#: g10/keyserver.c:149
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:529
+#: g10/keyserver.c:532
 msgid "disabled"
 msgstr "已停用"
 
-#: g10/keyserver.c:730
+#: g10/keyserver.c:733
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:814
-#: g10/keyserver.c:1432
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
 
-#: g10/keyserver.c:912
+#: g10/keyserver.c:915
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:914
+#: g10/keyserver.c:917
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1151
+#: g10/keyserver.c:1156
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1160
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1179
+#: g10/keyserver.c:1184
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在從 %s 伺服器 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "正在從 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1335
+#: g10/keyserver.c:1365
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1369
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1382
+#: g10/keyserver.c:1412
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1415
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1392
-#: g10/keyserver.c:1488
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1440
+#: g10/keyserver.c:1470
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1449
+#: g10/keyserver.c:1479
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1511
-#: g10/keyserver.c:2039
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1517
+#: g10/keyserver.c:1547
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1529
+#: g10/keyserver.c:1559
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有 `%s' 金鑰伺服器架構的經手程式\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1564
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' 動作在 `%s' 金鑰伺服器架構中未支援\n"
 
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1572
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援第 %d 版經手程式\n"
 
-#: g10/keyserver.c:1549
+#: g10/keyserver.c:1579
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1554
+#: g10/keyserver.c:1584
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部錯誤\n"
 
-#: g10/keyserver.c:1563
+#: g10/keyserver.c:1593
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1588
-#: g10/keyserver.c:1622
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
-#: g10/keyserver.c:1881
+#: g10/keyserver.c:1911
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1933
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "更新 1 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1935
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1991
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓取 URI %s: %s\n"
 
-#: g10/keyserver.c:1967
+#: g10/keyserver.c:1997
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法剖析 URI %s\n"
@@ -4607,8 +4530,7 @@ msgstr "公鑰加密過的資料: 完好的 DEK\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:486
-#: g10/pkclist.c:220
+#: g10/mainproc.c:486 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
@@ -4632,8 +4554,7 @@ msgstr "已用 %lu 個密語加密了\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:551
-#: g10/mainproc.c:573
+#: g10/mainproc.c:551 g10/mainproc.c:573
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
@@ -4708,20 +4629,17 @@ msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1719
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1719 g10/mainproc.c:1767
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1721
-#: g10/mainproc.c:1769
+#: g10/mainproc.c:1721 g10/mainproc.c:1769
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1723
-#: g10/mainproc.c:1771
+#: g10/mainproc.c:1723 g10/mainproc.c:1771
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
@@ -4730,64 +4648,62 @@ msgstr "完好的簽章來自於 \"%s\""
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1809
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1906
+#: g10/mainproc.c:1907
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1911
+#: g10/mainproc.c:1912
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:1914
+#: g10/mainproc.c:1915
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1916
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1916
+#: g10/mainproc.c:1917
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1916
-#: g10/trustdb.c:529
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2005
-#: g10/mainproc.c:2021
-#: g10/mainproc.c:2107
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2048
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+#: g10/mainproc.c:2049
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2057
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2114
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2123
+#: g10/mainproc.c:2124
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -4796,9 +4712,7 @@ msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:140
-#: g10/misc.c:168
-#: g10/misc.c:240
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
@@ -4827,60 +4741,64 @@ msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 
-#: g10/misc.c:353
-#, c-format
-msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告: 已不建議使用 %s 摘要演算法\n"
-
-#: g10/misc.c:459
+#: g10/misc.c:458
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:460
-#: g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
 
-#: g10/misc.c:693
+#: g10/misc.c:475
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "警告: 已不建議使用 %s 摘要演算法\n"
+
+#: g10/misc.c:491
+#, fuzzy, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "請注意: %s 在本版中無法使用\n"
+
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:752
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已不建議使用 \"%s\" 選項\n"
 
-#: g10/misc.c:699
+#: g10/misc.c:754
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:706
+#: g10/misc.c:761
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
 
-#: g10/misc.c:719
+#: g10/misc.c:774
 msgid "Uncompressed"
 msgstr "未壓縮"
 
-#: g10/misc.c:744
+#: g10/misc.c:799
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:871
+#: g10/misc.c:926
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1046
+#: g10/misc.c:1101
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的 `%s' 選項\n"
 
-#: g10/misc.c:1071
+#: g10/misc.c:1126
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的 `%s' 選項\n"
@@ -4932,11 +4850,11 @@ msgstr "`%s' 目錄已建立\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:747
+#: g10/parse-packet.c:756
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
-#: g10/parse-packet.c:1198
+#: g10/parse-packet.c:1207
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
@@ -4959,14 +4877,11 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:377
-#: g10/passphrase.c:653
-#: g10/passphrase.c:743
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 停用代理程式中\n"
 
-#: g10/passphrase.c:530
-#: g10/passphrase.c:912
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -4994,13 +4909,11 @@ msgstr "請輸入密語\n"
 msgid "cancelled by user\n"
 msgstr "由使用者所取消\n"
 
-#: g10/passphrase.c:803
-#: g10/passphrase.c:972
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:810
-#: g10/passphrase.c:977
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
@@ -5027,7 +4940,7 @@ msgstr "         (在主鑰 ID %s 上的子鑰)"
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
-#: g10/photoid.c:71
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5041,63 +4954,58 @@ msgstr ""
 "妳的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:93
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作照片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:114
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
-#: g10/photoid.c:125
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "妳確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:144
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
-#: g10/photoid.c:163
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:327
+#: g10/photoid.c:332
 msgid "no photo viewer set\n"
 msgstr "沒有設定照片檢視程式\n"
 
-#: g10/photoid.c:381
+#: g10/photoid.c:386
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:63
-#: g10/revoke.c:621
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:65
-#: g10/revoke.c:623
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:67
-#: g10/revoke.c:622
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:69
-#: g10/revoke.c:624
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:71
-#: g10/revoke.c:625
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -5118,43 +5026,44 @@ msgstr "iImMqQsS"
 msgid "No trust value assigned to:\n"
 msgstr "下列項目沒有對應的信任值:\n"
 
-#: g10/pkclist.c:247
+#: g10/pkclist.c:248
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
-#: g10/pkclist.c:257
-msgid "How much do you trust that this key actually belongs to the named user?\n"
+#: g10/pkclist.c:258
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
 msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = 我不知道或不想說\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我*不*信任\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:281
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我徹底信任\n"
 
-#: g10/pkclist.c:286
+#: g10/pkclist.c:287
 msgid "  m = back to the main menu\n"
 msgstr "  m = 回到主選單\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  s = skip this key\n"
 msgstr "  s = 跳過這把金鑰\n"
 
-#: g10/pkclist.c:290
+#: g10/pkclist.c:291
 msgid "  q = quit\n"
 msgstr "  q = 離開\n"
 
-#: g10/pkclist.c:294
+#: g10/pkclist.c:295
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5163,38 +5072,37 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:300
-#: g10/revoke.c:650
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "請問妳是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 
-#: g10/pkclist.c:335
+#: g10/pkclist.c:336
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被徹底信任金鑰的憑證:\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:421
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:425
+#: g10/pkclist.c:426
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:431
+#: g10/pkclist.c:432
 msgid "This key probably belongs to the named user\n"
 msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
-#: g10/pkclist.c:462
+#: g10/pkclist.c:463
 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"
@@ -5204,107 +5112,105 @@ msgstr ""
 "除非妳 **真的** 知道自己在做甚麼,\n"
 "否則妳最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:504
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:510
+#: g10/pkclist.c:511
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:519
+#: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:524
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         這很有可能表示此簽章是偽造的.\n"
 
-#: g10/pkclist.c:529
+#: g10/pkclist.c:530
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:535
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已停用.\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:555
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "請注意: 已驗證的簽署者地址為 `%s'\n"
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:562
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "請注意: 簽署者地址 `%s' 與 DNS 項目並不吻合\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:574
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
 
-#: g10/pkclist.c:581
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:604
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:605
-msgid "         There is no indication that the signature belongs to the owner.\n"
+#: g10/pkclist.c:606
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:615
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:622
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:623
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:823
-#: g10/pkclist.c:865
-#: g10/pkclist.c:1077
-#: g10/pkclist.c:1147
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:835
-#: g10/pkclist.c:1115
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已存在\n"
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:911
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:936
+#: g10/pkclist.c:937
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5312,34 +5218,33 @@ msgstr ""
 "\n"
 "請輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:961
+#: g10/pkclist.c:962
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:970
-#: g10/pkclist.c:1044
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:991
+#: g10/pkclist.c:992
 msgid "Public key is disabled.\n"
 msgstr "公鑰已停用.\n"
 
-#: g10/pkclist.c:1000
+#: g10/pkclist.c:1001
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已設過\n"
 
-#: g10/pkclist.c:1035
+#: g10/pkclist.c:1036
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1093
+#: g10/pkclist.c:1094
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已停用\n"
 
-#: g10/pkclist.c:1155
+#: g10/pkclist.c:1156
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
@@ -5347,9 +5252,7 @@ msgstr "沒有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 
-#: g10/plaintext.c:139
-#: g10/plaintext.c:144
-#: g10/plaintext.c:162
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
@@ -5407,12 +5310,8 @@ msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已撤銷"
 
-#: g10/revoke.c:102
-#: g10/revoke.c:116
-#: g10/revoke.c:128
-#: g10/revoke.c:174
-#: g10/revoke.c:186
-#: g10/revoke.c:586
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -5434,13 +5333,11 @@ msgstr "(這是把機密的撤銷金鑰)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:327
-#: g10/revoke.c:552
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:342
-#: g10/revoke.c:566
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -5459,28 +5356,28 @@ msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:498
+#: g10/revoke.c:496
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:509
+#: g10/revoke.c:507
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:516
+#: g10/revoke.c:514
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:533
+#: g10/revoke.c:531
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:541
+#: g10/revoke.c:539
 msgid "NOTE: This key is not protected!\n"
 msgstr "請注意: 這把金鑰未受保護!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:590
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5499,33 +5396,33 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:633
+#: g10/revoke.c:631
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:643
+#: g10/revoke.c:641
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:686
+#: g10/revoke.c:684
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:714
+#: g10/revoke.c:712
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:721
+#: g10/revoke.c:719
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
@@ -5597,42 +5494,44 @@ msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:179
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:191
-#, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
-msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-
-#: g10/sig-check.c:193
-#, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-
 #: g10/sig-check.c:203
 #, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+
+#: g10/sig-check.c:205
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+
+#: g10/sig-check.c:215
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:311
+#: g10/sig-check.c:329
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:613
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
@@ -5644,12 +5543,15 @@ msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:116
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:139
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:312
@@ -5668,7 +5570,8 @@ msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分
 
 #: g10/sign.c:830
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
 #: g10/sign.c:956
@@ -5684,8 +5587,7 @@ msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:126
-#: g10/skclist.c:190
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
@@ -5694,9 +5596,7 @@ msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:165
-#: g10/skclist.c:175
-#: g10/skclist.c:184
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
@@ -5709,8 +5609,7 @@ msgstr "已跳過: 私鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:58
-#: g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -5724,10 +5623,7 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:158
-#: g10/tdbdump.c:166
-#: g10/tdbdump.c:171
-#: g10/tdbdump.c:176
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
@@ -5758,20 +5654,17 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:226
-#: g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:127
-#: g10/tdbio.c:1443
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:133
-#: g10/tdbio.c:1450
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -5790,15 +5683,12 @@ msgstr "無法存取 `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:521
-#: g10/tdbio.c:544
-#: g10/tdbio.c:587
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:523
-#: g10/tdbio.c:590
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
@@ -5818,89 +5708,85 @@ msgstr "%s: 建立了無效的信任資料庫\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:600
+#: g10/tdbio.c:601
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:617
+#: g10/tdbio.c:618
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:649
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:657
+#: g10/tdbio.c:658
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:674
-#: g10/tdbio.c:694
-#: g10/tdbio.c:710
-#: g10/tdbio.c:724
-#: g10/tdbio.c:754
-#: g10/tdbio.c:1376
-#: g10/tdbio.c:1403
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:733
+#: g10/tdbio.c:734
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1180
+#: g10/tdbio.c:1181
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1201
+#: g10/tdbio.c:1202
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1220
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1428
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零失敗: %s\n"
 
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:1458
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加記錄失敗: %s\n"
 
 #: g10/tdbio.c:1502
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s: 建立了信任資料庫\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5947,128 +5833,134 @@ msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:422
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:431
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:466
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:472
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:524
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:526
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:507
-#: g10/trustdb.c:512
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:534
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:535
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:536
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:537
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:553
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:554
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:555
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:556
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:596
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:581
-#: g10/trustdb.c:2425
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:611
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:626
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:837
-#: g10/trustdb.c:1275
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1057
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2211
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2233
+#: g10/trustdb.c:2276
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2290
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2270
+#: g10/trustdb.c:2313
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2399
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2431
+#: g10/trustdb.c:2474
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -6327,51 +6219,47 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328
-#: util/miscutil.c:365
+#: util/miscutil.c:379 util/miscutil.c:416
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:329
-#: util/miscutil.c:370
+#: util/miscutil.c:380 util/miscutil.c:421
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331
-#: util/miscutil.c:367
+#: util/miscutil.c:382 util/miscutil.c:418
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332
-#: util/miscutil.c:371
+#: util/miscutil.c:383 util/miscutil.c:422
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:369
+#: util/miscutil.c:420
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:372
+#: util/miscutil.c:423
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:405
+#: util/miscutil.c:456
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:458
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:408
+#: util/miscutil.c:459
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:409
+#: util/miscutil.c:460
 msgid "cC"
 msgstr "cC"
 
@@ -6391,31 +6279,50 @@ msgstr "尚未啟用安全的記憶體時, 不可能進行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA 金鑰對會有 %u 位元長.\n"
+
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|管理者 PIN"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
+
 #~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+
 #~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
+
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
 #~ msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+
 #~ msgid "a user notation name must contain the '@' character\n"
 #~ msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+
 #~ msgid "a notation name must not contain more than one '@' character\n"
 #~ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+
 #~ msgid "a notation value must not use any control characters\n"
 #~ msgstr "標記值一定不能使用任何的控制字符\n"
+
 #~ msgid "WARNING: invalid notation data found\n"
 #~ msgstr "警告: 找到無效的標記資料\n"
+
 #~ msgid "not human readable"
 #~ msgstr "不是人類能讀得懂的"
+
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
-