keep on walking towards rc3

29 files changed, 15974 insertions, 15107 deletions

diff --git a/configure.ac b/configure.ac
index 7d865cd89..fb6ed870c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
 dnl 
-dnl GnuPG is distributed in the hope that it will be useful,
+dnl GnuPG is distributed in the hope that it will be useful,g
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
@@ -26,7 +26,7 @@ min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.4.3rc2, [email protected])
+AC_INIT(gnupg, 1.4.3-cvs, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/doc/detached-sig-verification-bug.txt b/doc/detached-sig-verification-bug.txt
new file mode 100644
index 000000000..a938cd7ee
--- /dev/null
+++ b/doc/detached-sig-verification-bug.txt
@@ -0,0 +1,231 @@
+           False positive signature verification in GnuPG
+           ==============================================
+                       (released 2006-02-15)
+
+
+Summary
+=======
+
+The Gentoo project identified a security related bug in GnuPG.  When
+using any current version of GnuPG for unattended signature
+verification (e.g. by scripts and mail programs), false positive
+signature verification of detached signatures may occur.
+
+This problem affects the tool *gpgv*, as well as using "gpg --verify"
+to imitate gpgv, if only the exit code of the process is used to
+decide whether a detached signature is valid.  This is a plausible
+mode of operation for gpgv.
+
+If, as suggested, the --status-fd generated output is used to decide
+whether a signature is valid, no problem exists.  In particular
+applications making use of the GPGME library[2] are not affected.
+
+To solve this problem an update of the current stable version has been
+released (see below).
+
+Please do not send private mail in response to this message.  The
+mailing list gnupg-devel is the best place to discuss this problem
+(please subscribe first so you don't need moderator approval [1]).
+
+
+Impact:
+=======
+
+Signature verification of detached signatures does not work, thus
+modified versions of signature protected files may not be detected.
+
+All versions of gnupg prior to 1.4.2.1 are affected if they are used
+in certain unattended operation modes.
+
+There is no problem using GnuPG in an interactive way because GnuPG
+won't print any signature status at all; i.e. no "Good signature".
+
+Scripts and applications using gpg or gpgv with the --status-fd option
+and properly parsing this output are not affected.
+
+Applications using the GPGME library[2] are not affected.
+
+The GnuPG versions 1.9 are not affected unless the currently
+deprecated gpg part has been enabled.
+
+
+Solution:
+=========
+
+Update GnuPG as soon as possible to version 1.4.2.1.  There are no
+fixes for older versions available, although the fix described below
+may be adjusted for them.
+
+To update please follow the instructions found at
+http://www.gnupg.org/download/ or read on:
+
+GnuPG 1.4.2.1 may be downloaded from one of the GnuPG mirror sites or
+direct from ftp://ftp.gnupg.org/gcrypt/ .  The list of mirrors can be
+found at http://www.gnupg.org/mirrors.html .  Note, that GnuPG is not
+available at ftp.gnu.org.
+
+On the mirrors you should find the following files in the *gnupg*
+directory:
+
+  gnupg-1.4.2.1.tar.bz2 (2.8M)
+  gnupg-1.4.2.1.tar.bz2.sig
+
+      GnuPG source compressed using BZIP2 and OpenPGP signature.
+
+  gnupg-1.4.2.1.tar.gz (4.0M)
+  gnupg-1.4.2.1.tar.gz.sig
+
+      GnuPG source compressed using GZIP and OpenPGP signature.
+
+  gnupg-1.4.2-1.4.2.1.diff.bz2 (39k)
+
+      A patch file to upgrade a 1.4.2 GnuPG source. 
+
+Select one of them. To shorten the download time, you probably want to
+get the BZIP2 compressed file.  Please try another mirror if
+exceptional your mirror is not yet up to date.
+
+In the *binary* directory, you should find these files:
+
+  gnupg-w32cli-1.4.2.1.exe (1.4M)
+  gnupg-w32cli-1.4.2.1.exe.sig
+
+      GnuPG compiled for Microsoft Windows and OpenPGP signature.
+      Note that this is a command line version and now comes with a
+      graphical installer tool.  The source files are the same as
+      given above.  Note, that a new version of the Gpg4Win
+      package[4], including an updated version of GnuPG will be
+      available later the day.
+
+
+In order to check that the version of GnuPG which you are going to
+install is an original and unmodified one, you can do it in one of
+the following ways:
+
+ * If you already have a trusted version of GnuPG installed, you
+   can simply check the supplied signature.  For example to check the
+   signature of the file gnupg-1.4.2.1.tar.bz2 you would use this command:
+
+     gpg --verify gnupg-1.4.2.1.tar.bz2.sig
+
+   This checks whether the signature file matches the source file.
+   You should see a message indicating that the signature is good and
+   made by that signing key.  Make sure that you have the right key,
+   either by checking the fingerprint of that key with other sources
+   or by checking that the key has been signed by a trustworthy other
+   key.  Note, that you can retrieve the signing key using "finger wk
+   'at' g10code.com" or "finger dd9jn 'at' gnu.org" or using the
+   keyservers.  From time to time I prolong the expiration date; thus
+   you might need a fresh copy of that key.
+
+   Never use a GnuPG version you just downloaded to check the
+   integrity of the source - use an existing GnuPG installation!
+   Watch out for a "Good signature" messages.
+
+ * If you are not able to use an old version of GnuPG, you have to
+   verify the SHA-1 checksum.  Assuming you downloaded the file
+   gnupg-1.4.2.1.tar.bz2, you would run the sha1sum command like this:
+
+     sha1sum gnupg-1.4.2.1.tar.bz2
+
+   and check that the output matches the first line from the
+   following list:
+
+1c0306ade25154743d6f6f9ac05bee74c55c6eda  gnupg-1.4.2.1.tar.bz2
+cefc74560f21bde74eed298d86460612cd7e12ee  gnupg-1.4.2.1.tar.gz
+98d597b1a9871b4aadc820d8641b36ce09125612  gnupg-1.4.2-1.4.2.1.diff.bz2
+a4db35a72d72df8e76751adc6f013b4c96112fd4  gnupg-w32cli-1.4.2.1.exe
+
+
+Background:
+===========
+
+If a file with arbitrary data, for example 64 times the character
+0xCA, is used as the detached signature, any data file will lead to
+gpg exiting with 0 (success).  There won't be any messages indicating
+that the signature is valid or false:
+
+  $ fortune >x.txt
+  $ perl -e 'print "\xca"x"64"' >x.txt.sig
+  $ gpgv x.txt.sig x.txt
+  $ echo $?
+  0
+
+Cleary this should not return success.
+
+The same problem appears when using "gpg --verify" in place of gpgv.
+However in this case any application should to do further checks to
+make sure that the key verifying the signature is actually the desired
+one, thus using "gpg --verify" without processing the --status-fd
+generated output is in general the wrong approach.
+
+The fixed version makes sure that gpgv and "gpg --verify" won't return
+success if no signature has been seen.  A minimal but sufficient fix
+against 1.4.2 and possible older versions is:
+
+====8<============
+--- g10/mainproc.c	(revision 4001)
++++ g10/mainproc.c	(working copy)
+@@ -77,6 +77,7 @@
+         int op;
+         int stop_now;
+     } pipemode;
++    int any_sig_seen;  /* Set to true if a signature packet has been seen. */
+ };
+ 
+ 
+@@ -217,6 +218,7 @@
+ {
+     KBNODE node;
+ 
++    c->any_sig_seen = 1;
+     if( pkt->pkttype == PKT_SIGNATURE && !c->list ) {
+ 	/* This is the first signature for the following datafile.
+ 	 * GPG does not write such packets; instead it always uses
+@@ -1137,6 +1139,18 @@
+     c->signed_data = signedfiles;
+     c->sigfilename = sigfilename;
+     rc = do_proc_packets( c, a );
++ 
++    /* If we have not encountered any signature we print an error
++       messages, send a NODATA status back and return an error code.
++       Using log_error is required because verify_files does not check
++       error codes for each file but we want to terminate the process
++       with an error. */ 
++    if (!rc && !c->any_sig_seen)
++      {
++ 	 write_status_text (STATUS_NODATA, "4");
++        log_error (_("no signature found\n"));
++        rc = -1;
++      }
+     m_free( c );
+     return rc;
+ }
+====>8============
+
+Note that the released version also includes a test case for this bug
+and prints an additional diagnostic.  With the patch above the output
+using the same test data as above should be:
+
+  $ gpgv x.txt.sig x.txt
+  gpgv: no signature found
+  gpgv: verify signatures failed: eof
+  $ echo $?
+  2
+
+
+
+Thanks
+======
+
+taviso from the Gentoo project found this vulnerability and informed
+me on Monday evening.  Unfortunately I had already switched off my
+monitor at that time.  The update has been released yesterday evening
+(CET).
+
+
+
+
+[1] http://lists.gnupg.org/mailman/listinfo/gnupg-devel
+[2] http://www.gnupg.org/related_software/gpgme
+[3] http://www.gpg4win.org
diff --git a/doc/embedded-sig-verification-bug.txt b/doc/embedded-sig-verification-bug.txt
new file mode 100644
index 000000000..2a2595497
--- /dev/null
+++ b/doc/embedded-sig-verification-bug.txt
@@ -0,0 +1,211 @@
+           GnuPG does not detect injection of unsigned data
+           ================================================
+                 (released 2006-03-09, CVE-2006-0049)
+
+
+Summary
+=======
+
+In the aftermath of the false positive signature verfication bug
+(announced 2006-02-15) more thorough testing of the fix has been done
+and another vulnerability has been detected.
+
+This new problem affects the use of *gpg* for verification of
+signatures which are _not_ detached signatures.  The problem also
+affects verification of signatures embedded in encrypted messages;
+i.e. standard use of gpg for mails.
+
+To solve this problem, an update of the current stable version has
+been released (see below).
+
+Please do not respond to this message.  The mailing list gnupg-devel
+is the best place to discuss this problem (please subscribe first so
+you don't need moderator approval [1]).
+
+
+Impact:
+=======
+
+Signature verification of non-detached signatures may give a positive
+result but when extracting the signed data, this data may be prepended
+or appended with extra data not covered by the signature.  Thus it is
+possible for an attacker to take any signed message and inject extra
+arbitrary data.
+
+Detached signatures (a separate signature file) are not affected.
+
+All versions of gnupg prior to 1.4.2.2 are affected.
+
+Scripts and applications using gpg to verify the integrity of data are
+affected. This includes applications using the GPGME library[2].
+
+The GnuPG version 1.9.x is not affected unless the currently
+deprecated gpg part has been enabled.
+
+
+Solution:
+=========
+
+Update GnuPG as soon as possible to version 1.4.2.2.  There are no
+fixes for older versions available.
+
+If you can't get an update from your vendor, please follow the
+instructions found at http://www.gnupg.org/download/ or read on:
+
+GnuPG 1.4.2.2 may be downloaded from one of the GnuPG mirror sites or
+direct from ftp://ftp.gnupg.org/gcrypt/ .  The list of mirrors can be
+found at http://www.gnupg.org/mirrors.html .  Note, that GnuPG is not
+available at ftp.gnu.org.
+
+On the mirrors you should find the following files in the *gnupg*
+directory:
+
+  gnupg-1.4.2.2.tar.bz2 (2.8M)
+  gnupg-1.4.2.2.tar.bz2.sig
+
+      GnuPG source compressed using BZIP2 and OpenPGP signature.
+
+  gnupg-1.4.2.2.tar.gz (4.0M)
+  gnupg-1.4.2.2.tar.gz.sig
+
+      GnuPG source compressed using GZIP and OpenPGP signature.
+
+  gnupg-1.4.2.1-1.4.2.2.diff.bz2 (101k)
+
+      A patch file to upgrade a 1.4.2.1 GnuPG source. 
+
+Select one of them. To shorten the download time, you probably want to
+get the BZIP2 compressed file.  Please try another mirror if
+exceptional your mirror is not yet up to date.
+
+In the *binary* directory, you should find these files:
+
+  gnupg-w32cli-1.4.2.2.exe (1.4M)
+  gnupg-w32cli-1.4.2.2.exe.sig
+
+      GnuPG compiled for Microsoft Windows and OpenPGP signature.
+      Note that this is a command line version and now comes with a
+      graphical installer tool.  The source files are the same as
+      given above.  Note, that a new version of the Gpg4Win
+      package[3], including a fixed version of GnuPG has also been
+      released today.
+
+
+In order to check that the version of GnuPG which you are going to
+install is an original and unmodified one, you can do it in one of
+the following ways:
+
+ * If you already have a trusted version of GnuPG installed, you can
+   simply check the supplied signature.  Due to the fact that detached
+   signatures are used, the problem described here does not affect
+   this verification.  For example to check the signature of the file
+   gnupg-1.4.2.2.tar.bz2 you would use this command:
+
+     gpg --verify gnupg-1.4.2.2.tar.bz2.sig
+
+   This checks whether the signature file matches the source file.
+   You should see a message indicating that the signature is good and
+   made by that signing key.  Make sure that you have the right key,
+   either by checking the fingerprint of that key with other sources
+   or by checking that the key has been signed by a trustworthy other
+   key.  Note, that you can retrieve the signing key using "finger wk
+   'at' g10code.com" or "finger dd9jn 'at' gnu.org" or using the
+   keyservers.  From time to time I prolong the expiration date; thus
+   you might need a fresh copy of that key.
+
+   Never use a GnuPG version you just downloaded to check the
+   integrity of the source - use an existing GnuPG installation!
+   Watch out for a "Good signature" messages.
+
+ * If you are not able to use an old version of GnuPG, you have to
+   verify the SHA-1 checksum.  Assuming you downloaded the file
+   gnupg-1.4.2.1.tar.bz2, you would run the sha1sum command like this:
+
+     sha1sum gnupg-1.4.2.2.tar.bz2
+
+   and check that the output matches the first line from the
+   following list:
+
+f5559ddb004e0638f6bd9efe2bac00134c5065ba  gnupg-1.4.2.2.tar.bz2
+959540c1c6158e09d668ceee055bf366dc26d0bd  gnupg-1.4.2.2.tar.gz
+880b3e937f232b1ca366bda37c4a959aacbd84f3  gnupg-1.4.2.1-1.4.2.2.diff.bz2
+95dd7fd4c49423b86704acfc396ce5a53c8b19e7  gnupg-w32cli-1.4.2.2.exe
+
+
+
+Background:
+===========
+
+OpenPGP messages are made up of packets.  The signed data is a packet,
+the actual signature is a packet and there are several control packets
+as well.  For example:
+
+   O + D + S 
+
+This describes a standard signed message made made up of a control
+packet (O for one-pass signature packet), the actual signed data (D)
+and the actual signature packet (S).  gpg checks that the signature S
+is valid over the data D.  This is actually easy if not OpenPGP and
+GnuPG would have a long tradition of changing the fromats.  PGP 2
+versions used a different way of composing these packets:
+
+   S + D
+
+and early versions of gpg, released before RFC2440, even created
+
+   D + S
+
+i.e. without the one-pass packet.  Still this would all be easy to
+process properly but in an ill-advised attempt to make things easier,
+gpg allowed the processing of multiple signatures per file, like
+
+   O1 + D1 + S1 + O2 + D2 + S2
+
+where two standard signatures are concatenated.  Now when combining
+this with the other variants of signatures, things get really messy
+and it is not always possible to assocciate the signature (S) with the
+signed data (D).  gpg checked that this all works but unfortunately
+these checks are not sufficient enough.  The attack is to change a
+standard message to inject faked data (F).  A simple case is this:
+
+   F + O + D + S 
+
+gpg now happily skips F for verification and does a proper signature
+verification of D and if this succeeds, prints a positive result.
+However when asked to output the actual signed data it will output the
+concatenation of F + D and thus create the impression that both are
+covered by the signature.  Depending on how gpg is invoked (in a
+pipeline or using --output) it may even output just F and not at all
+D.  There are several variants of the attack in where to put the faked
+data.
+
+The only correct solution to this problem is to get rid of the feature
+to check concatenated signatures - this allows for strict checking of
+valid packet composition.  This is what has been done in 1.4.2.2 and
+in the forthcoming 1.4.3rc2.  These versions accept signatures only if
+they are composed of
+
+  O + D + S
+  S + D
+  
+Cleartext signatures are of course also supported, they are similiar
+to the O+D+S case.
+
+The actual checking for valid signature packet composition is done at
+g10/mainproc.c, at the top of check_sig_and_print().
+
+
+Thanks
+======
+
+Tavis Ormandy again poked on gpg and found this vulnerability. 
+
+The new version has been released yesterday and should by now be
+available on all mirrors.
+
+
+
+
+[1] http://lists.gnupg.org/mailman/listinfo/gnupg-devel
+[2] http://www.gnupg.org/related_software/gpgme
+[3] http://www.gpg4win.org
diff --git a/po/be.po b/po/be.po
index 88d5adcbf..dc5ae0d6a 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "запіс у stdout\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -379,14 +379,14 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr ""
 
@@ -558,8 +558,8 @@ msgstr ""
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -647,7 +647,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Загад> "
 
@@ -666,7 +666,7 @@ msgstr "несумяшчальныя загады\n"
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -710,7 +710,7 @@ msgstr "Паўтарыце пароль: "
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -720,7 +720,7 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -767,7 +767,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -786,7 +786,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -811,7 +811,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -973,7 +973,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -981,128 +981,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1214,7 +1214,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr ""
 
@@ -1222,7 +1222,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr ""
 
@@ -1306,480 +1306,470 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr ""
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr ""
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr ""
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2267,7 +2257,7 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
@@ -2540,51 +2530,51 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2592,244 +2582,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "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 ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2837,199 +2827,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3037,470 +3032,487 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"Выбары:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 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:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+msgid "Enter the notation: "
+msgstr ""
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Перазапісаць (y/N)?"
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3530,148 +3542,148 @@ msgstr "за шмат пераваг для \"%c\"\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3681,7 +3693,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3691,48 +3703,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3742,44 +3754,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3787,7 +3799,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3802,34 +3814,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -3837,7 +3849,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -3845,91 +3857,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -3950,50 +3962,42 @@ msgstr ""
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr ""
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr ""
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4308,119 +4312,119 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5215,69 +5219,69 @@ msgstr ""
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -5532,128 +5536,124 @@ msgstr ""
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index cfe7eaed4..f86521950 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -61,10 +61,10 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -98,9 +98,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -420,15 +420,15 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
@@ -605,8 +605,8 @@ msgstr "   (%d) RSA (només xifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
@@ -630,7 +630,7 @@ msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -641,7 +641,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -698,7 +698,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Ordre> "
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -763,7 +763,7 @@ msgstr "Repetiu la contrasenya: "
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -773,7 +773,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -824,7 +824,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -843,7 +843,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -872,7 +872,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1052,7 +1052,7 @@ msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1060,130 +1060,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1193,52 +1193,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detall"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1249,7 +1249,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1304,7 +1304,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -1312,7 +1312,7 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compressió: "
 
@@ -1399,500 +1399,487 @@ msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, 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:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, 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:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, 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:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 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:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
-"amb el signe «=»\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2491,7 +2478,7 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
@@ -2784,51 +2771,51 @@ msgstr "error en crear «%s»: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2840,65 +2827,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2907,11 +2894,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2920,11 +2907,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2933,54 +2920,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2990,32 +2977,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3024,100 +3011,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3125,11 +3112,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3138,65 +3125,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3204,147 +3191,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3352,241 +3345,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notació: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3594,19 +3592,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3616,7 +3614,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3625,58 +3623,58 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3685,184 +3683,194 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, 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:3482
+#: g10/keyedit.c:3533
 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:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notació de signatura: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Voleu sobreescriure? (s/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, 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:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3893,149 +3901,149 @@ msgstr "hi ha massa preferències «%c»\n"
 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:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, 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:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, 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:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, 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:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4051,7 +4059,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4067,42 +4075,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, 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:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4110,12 +4118,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4132,44 +4140,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4180,7 +4188,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4197,23 +4205,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:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4221,12 +4229,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4238,7 +4246,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4250,53 +4258,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, 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:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, 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:2983
+#: g10/keygen.c:3032
 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:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4305,13 +4313,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, 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:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4320,7 +4328,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4328,26 +4336,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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, 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:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4368,50 +4376,42 @@ msgstr "Política de signatura: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "no llegible per humans"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4739,120 +4739,120 @@ msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5733,36 +5733,36 @@ msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP "
 "2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP "
 "2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5770,7 +5770,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5779,39 +5779,39 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -6081,136 +6081,132 @@ msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 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:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, 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:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6551,6 +6547,29 @@ 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"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
+#~ "amb el signe «=»\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
+
+#~ msgid "not human readable"
+#~ msgstr "no llegible per humans"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "llig opcions del fitxer"
@@ -7037,9 +7056,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "   signed by %08lX at %s%s\n"
 #~ msgstr "   signat per %08lX el %s%s\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Notació: "
-
 #~ msgid "Policy: "
 #~ msgstr "Política: "
 
diff --git a/po/cs.po b/po/cs.po
index 951964039..204f0516e 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "zapisuji tajn� kl�� do `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr "nemohu ��st `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -389,14 +389,14 @@ msgstr "OpenPGp karta nen� dostupn�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
@@ -562,8 +562,8 @@ msgstr "   (2) �ifrovac� kl��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -583,7 +583,7 @@ msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
@@ -591,7 +591,7 @@ msgstr "ukon�it toto menu"
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
@@ -643,7 +643,7 @@ msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "P��kaz> "
 
@@ -659,7 +659,7 @@ msgstr "administr�torsk� p��kazy jsou povoleny\n"
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -706,7 +706,7 @@ msgstr "Opakujte tento PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -716,7 +716,7 @@ msgstr "nelze otev��t `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -763,7 +763,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -782,7 +782,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -809,7 +809,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -977,7 +977,7 @@ msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -985,127 +985,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1115,55 +1115,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1171,7 +1171,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1221,7 +1221,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "�ifra: "
 
@@ -1229,7 +1229,7 @@ msgstr "�ifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Komprese: "
 
@@ -1332,491 +1332,479 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 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:2915
+#: g10/gpg.c:2887
 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:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 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:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
-"a mus� kon�it znakem '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2411,7 +2399,7 @@ msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
@@ -2686,51 +2674,51 @@ msgstr "zdroj bloku kl��e `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2742,17 +2730,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2762,47 +2750,47 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2811,11 +2799,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2825,13 +2813,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2841,54 +2829,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2898,31 +2886,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2931,76 +2919,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3008,11 +2996,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3020,180 +3008,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3205,220 +3199,228 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 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:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"Mo�nosti:\n"
+" "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3426,17 +3428,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3444,7 +3446,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3453,54 +3455,54 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3509,170 +3511,180 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 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:3469
+#: g10/keyedit.c:3520
 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:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 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:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Podepisovac� notace: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "P�epsat (a/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, 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:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3699,147 +3711,147 @@ msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, 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:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, 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:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3855,7 +3867,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:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3871,38 +3883,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:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3910,11 +3922,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:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3930,44 +3942,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3978,7 +3990,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -3993,25 +4005,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4019,12 +4031,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4036,7 +4048,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4049,50 +4061,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, 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:2983
+#: g10/keygen.c:3032
 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:2994
+#: g10/keygen.c:3043
 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"
@@ -4100,12 +4112,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4113,7 +4125,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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4121,25 +4133,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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, 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:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, 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"
@@ -4160,49 +4172,41 @@ msgstr "Podepisovac� politika: "
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovan� keyserver: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "nen� v p��mo �iteln�m form�tu"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
@@ -4517,121 +4521,121 @@ msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -5457,31 +5461,31 @@ msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5489,7 +5493,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5498,23 +5502,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5522,16 +5526,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -5791,120 +5795,116 @@ 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:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 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:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, 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:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5912,7 +5912,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6227,5 +6227,27 @@ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo "
+#~ "podtr��tka a mus� kon�it znakem '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
+
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
+
+#~ msgid "not human readable"
+#~ msgstr "nen� v p��mo �iteln�m form�tu"
+
 #~ msgid "expired: %s)"
 #~ msgstr "platnost skon�ila: %s)"
diff --git a/po/da.po b/po/da.po
index 5fb1cd15b..a007642b6 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -392,14 +392,14 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -578,8 +578,8 @@ msgstr "   (%d) ElGamal (krypt�r kun)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -603,7 +603,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -612,7 +612,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -669,7 +669,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr "konfliktende kommandoer\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -736,7 +736,7 @@ msgstr "Gentag kodes�tning: "
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -746,7 +746,7 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -793,7 +793,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -812,7 +812,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -837,7 +837,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -999,7 +999,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1007,132 +1007,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1142,57 +1142,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1243,7 +1243,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr ""
 
@@ -1251,7 +1251,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
@@ -1336,500 +1336,488 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-
-#: g10/gpg.c:4039
-#, fuzzy
-msgid "a user notation name must contain the '@' character\n"
-msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2324,7 +2312,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -2599,51 +2587,51 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2651,461 +2639,466 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "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 ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
+msgstr "Gener�r en annull�rbar certifikat"
+
+#: g10/keyedit.c:1430
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3113,496 +3106,513 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"Indstillinger:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 #, 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:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 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:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, 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:4060
+#: g10/keyedit.c:4111
 #, 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:4122
+#: g10/keyedit.c:4173
+msgid "Enter the notation: "
+msgstr ""
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Overskriv (j/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 #, 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:4359
+#: g10/keyedit.c:4600
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, 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:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3632,150 +3642,150 @@ msgstr "vis pr�ferencer"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 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:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3785,7 +3795,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3795,52 +3805,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3850,44 +3860,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3898,7 +3908,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3913,24 +3923,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 #, 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3938,12 +3948,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -3951,7 +3961,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -3959,92 +3969,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4067,54 +4077,46 @@ msgstr "%s signatur fra: %s\n"
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr ""
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr ""
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 #, 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:1530
+#: g10/keylist.c:1514
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4432,121 +4434,121 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5371,69 +5373,69 @@ msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -5689,129 +5691,125 @@ msgstr ""
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6130,6 +6128,17 @@ 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 "a user notation name must contain the '@' character\n"
+#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "l�s indstillinger fra fil"
 
diff --git a/po/de.po b/po/de.po
index 778c53384..7d50c78b7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-10-06 11:59+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -389,14 +389,14 @@ msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -565,8 +565,8 @@ msgstr "   (2) Verschl�sselungs-Schl�ssel\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schl�ssel\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
@@ -586,7 +586,7 @@ msgstr "Geheime Teile des Schl�ssels sind nicht vorhanden\n"
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schl�ssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
@@ -594,7 +594,7 @@ msgstr "Men� verlassen"
 msgid "show admin commands"
 msgstr "Zeige Admin-Kommandos"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
@@ -646,7 +646,7 @@ msgstr "Men� f�r �ndern oder Entsperren der PIN"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Befehl> "
 
@@ -662,7 +662,7 @@ msgstr "Admin-Befehle sind erlaubt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -711,7 +711,7 @@ msgstr "Geben Sie die PIN nochmal ein: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -721,7 +721,7 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -770,7 +770,7 @@ msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -791,7 +791,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -822,7 +822,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %"
 "s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -997,7 +997,7 @@ msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,127 +1005,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "Daten auf einer Karte �ndern"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "PIN einer Karte �ndern"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,51 +1135,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1240,7 +1240,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
@@ -1248,7 +1248,7 @@ msgstr "Verschl�.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Komprimierung: "
 
@@ -1343,500 +1343,487 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export-Option.\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "Ung�ltige Export-Option\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "Ung�ltige Listen-Option\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "Ung�ltige �berpr�fungs-Option\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschl�sselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
-"enthalten und mu� mit einem '=' enden\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -2439,7 +2426,7 @@ msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2734,51 +2721,51 @@ msgstr "Fehler beim Erstellen von `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2792,17 +2779,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2812,48 +2799,48 @@ msgstr ""
 "Eine Tiefe gr��er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
 "Trust-Signatures f�r Sie zu machen.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
 "oder nur die Eingabetaste f�r keine Domain\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2862,11 +2849,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2875,13 +2862,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2890,44 +2877,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2935,11 +2922,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2949,33 +2936,33 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2984,14 +2971,14 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2999,85 +2986,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3085,11 +3072,11 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3097,203 +3084,209 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3301,233 +3294,238 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannter Unterschriftentyp `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "\"Notation\": "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3535,20 +3533,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3556,7 +3554,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
 "dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3566,54 +3564,54 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie k�nnen einem PGP2-artigen Schl���sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "ung�ltig"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3623,37 +3621,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl���sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3661,146 +3659,156 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Beglaubigungs-\"Notation\": "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "�berschreiben (j/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3829,151 +3837,151 @@ msgstr "zu viele Komprimierungsvoreinstellungen\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "Daten verschl�sseln"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 #, fuzzy
 msgid "Authenticate"
 msgstr "uneingeschr�nkt"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 #, fuzzy
 msgid "Current allowed actions: "
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 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:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3989,7 +3997,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:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4005,38 +4013,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:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "Schl�ssel verf�llt nie\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "Signature verf�llt nie\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verf�llt am %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verf�llt am %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4044,11 +4052,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4065,44 +4073,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4113,7 +4121,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4128,23 +4136,23 @@ msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4152,12 +4160,12 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4170,7 +4178,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4181,50 +4189,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4234,12 +4242,12 @@ msgstr ""
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4247,7 +4255,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4255,26 +4263,26 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
@@ -4295,49 +4303,41 @@ msgstr "Beglaubigungsrichtlinie: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "nicht als Klartext darstellbar"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
@@ -4663,121 +4663,121 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "Bin�re"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste gepr�ft.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -5651,39 +5651,39 @@ msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Notationen k�nnen in einen v3 (PGP 2.x-artigen) Schl�ssel nicht eingetragen "
 "werden\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "Notationen k�nnen in eine v3 (PGP 2.x-artige) Schl�sselunterschrift nicht "
 "eingetragen werden\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu gro�). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schl�ssel nicht "
 "eingetragen werden\n"
 
 # translated by wk
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einem v3 Schl�ssel(PGP 2.x artig) nicht gespeichert "
 "werden\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5691,7 +5691,7 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5700,40 +5700,40 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schl�ssel machen\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -6000,134 +6000,130 @@ msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[verfallen]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "unbekannt"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginal"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "vollst�ndig"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, fuzzy, 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:612
+#: g10/trustdb.c:607
 #, fuzzy, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchf�hren\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 # translated by wk
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschr�nkt vertrauensw�rdige Schl�ssel gefunden\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n"
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6448,6 +6444,29 @@ 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder "
+#~ "Unterstriche enthalten und mu� mit einem '=' enden\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
+
+#~ msgid "not human readable"
+#~ msgstr "nicht als Klartext darstellbar"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "Optionen aus der Datei lesen"
@@ -7099,9 +7118,6 @@ msgstr ""
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "\"Notation\": "
-
 #~ msgid "Policy: "
 #~ msgstr "Richtlinie: "
 
diff --git a/po/el.po b/po/el.po
index ec261f537..136a5e187 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -394,15 +394,15 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -580,8 +580,8 @@ msgstr "   (%d) RSA (��� ������������� ����)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -605,7 +605,7 @@ msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -614,7 +614,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -671,7 +671,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "������> "
 
@@ -690,7 +690,7 @@ msgstr "������������� �������\n"
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -735,7 +735,7 @@ msgstr "����������� �� ����� ������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,7 +745,7 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -795,7 +795,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -814,7 +814,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -845,7 +845,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1022,7 +1022,7 @@ msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1030,128 +1030,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1161,51 +1161,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "���������"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1213,7 +1213,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1263,7 +1263,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "���������������: "
 
@@ -1271,7 +1271,7 @@ msgstr "���������������: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "��������: "
 
@@ -1358,503 +1358,490 @@ msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
-"��� �� ����� �� ��� '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2446,7 +2433,7 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
@@ -2732,51 +2719,51 @@ msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2789,63 +2776,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2854,11 +2841,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2867,12 +2854,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2881,43 +2868,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2925,11 +2912,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2939,32 +2926,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2973,21 +2960,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2995,14 +2982,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3010,65 +2997,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3076,213 +3063,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3290,237 +3283,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "��������: "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3528,19 +3526,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3548,7 +3546,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3557,55 +3555,55 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3615,38 +3613,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3654,146 +3652,156 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "�������� ���������: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "��������� (y/N); "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3823,149 +3831,149 @@ msgstr "���� ������ `%c' �����������\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3981,7 +3989,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3997,40 +4005,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4038,12 +4046,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4060,44 +4068,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4108,7 +4116,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4123,23 +4131,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4147,12 +4155,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4164,7 +4172,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4176,50 +4184,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4230,12 +4238,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4243,7 +4251,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4251,28 +4259,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -4293,50 +4301,42 @@ msgstr "�������� ���������: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "�������������: �������� �� ������ �������� ���������\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "�� ����������"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4657,119 +4657,119 @@ msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -5628,34 +5628,34 @@ msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
 "����)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5663,7 +5663,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5672,23 +5672,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5696,16 +5696,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -5970,130 +5970,126 @@ msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6411,6 +6407,29 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\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"
+
+#, fuzzy
+#~ 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 "� ���� ��������� ������ �� �� ������������ ���������� control\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "�������������: �������� �� ������ �������� ���������\n"
+
+#~ msgid "not human readable"
+#~ msgstr "�� ����������"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "�������� �������� ��� ������"
@@ -7052,9 +7071,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  ����������: %s ����: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "��������: "
-
 #~ msgid "Policy: "
 #~ msgstr "��������: "
 
diff --git a/po/eo.po b/po/eo.po
index 322795b09..e6d627bed 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -391,15 +391,15 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -602,7 +602,7 @@ msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -611,7 +611,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Komando> "
 
@@ -687,7 +687,7 @@ msgstr "malkongruaj komandoj\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -735,7 +735,7 @@ msgstr "Ripetu pasfrazon: "
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,7 +745,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -794,7 +794,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -813,7 +813,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -838,7 +838,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1004,7 +1004,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,128 +1012,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1143,51 +1143,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1195,7 +1195,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1245,7 +1245,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr ""
 
@@ -1253,7 +1253,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
@@ -1338,502 +1338,487 @@ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4031
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
-"kaj fini per '='\n"
-
-#: g10/gpg.c:4039
-#, fuzzy
-msgid "a user notation name must contain the '@' character\n"
-msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2413,7 +2398,7 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
@@ -2689,51 +2674,51 @@ msgstr "eraro dum kreado de '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2746,64 +2731,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2814,7 +2799,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2823,7 +2808,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2834,12 +2819,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,7 +2835,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2859,53 +2844,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2914,31 +2899,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2947,98 +2932,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3046,11 +3031,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3058,202 +3043,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3261,261 +3251,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notacio: "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3524,55 +3519,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 #, 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3582,181 +3577,191 @@ 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:3301
+#: g10/keyedit.c:3352
 #, 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:3321
+#: g10/keyedit.c:3372
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 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:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, 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:4060
+#: g10/keyedit.c:4111
 #, 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Subskribo-notacio: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "�u surskribi (j/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 #, 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:4359
+#: g10/keyedit.c:4600
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3786,150 +3791,150 @@ msgstr "tro da '%c'-preferoj\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3945,7 +3950,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3961,40 +3966,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4002,12 +4007,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4023,44 +4028,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4071,7 +4076,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4086,23 +4091,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4110,12 +4115,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4127,7 +4132,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4139,50 +4144,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4191,12 +4196,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4204,7 +4209,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4212,26 +4217,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -4253,55 +4258,47 @@ msgstr "Subskribo-gvidlinioj: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVERTO: nevalida notacia dateno trovita\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "ne homlegebla"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 #, 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:1530
+#: g10/keylist.c:1514
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4621,121 +4618,121 @@ msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -5576,30 +5573,30 @@ msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5607,7 +5604,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5616,37 +5613,37 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -5907,129 +5904,125 @@ msgstr "fido-registro %lu ne havas petitan specon %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6350,6 +6343,31 @@ 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+#~ "kaj fini per '='\n"
+
+#, fuzzy
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVERTO: nevalida notacia dateno trovita\n"
+
+#~ msgid "not human readable"
+#~ msgstr "ne homlegebla"
+
+#, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "legi la opciojn el dosiero"
 
@@ -6963,9 +6981,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Notacio: "
-
 #~ msgid "Policy: "
 #~ msgstr "Gvidlinio: "
 
diff --git a/po/es.po b/po/es.po
index 8ca1c5288..d6947ef49 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -44,10 +44,10 @@ msgstr "escribiendo clave privada en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -86,9 +86,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -399,14 +399,14 @@ msgstr "tarjeta OpenPGP no disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -574,8 +574,8 @@ msgstr "   (2) Clave de cifrado\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -595,7 +595,7 @@ msgstr "las partes secretas de la clave no est�n disponibles\n"
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -603,7 +603,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -655,7 +655,7 @@ msgstr "men� para cambiar o desbloquear el PIN"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Orden> "
 
@@ -671,7 +671,7 @@ msgstr "Se permiten �rdenes de administrador\n"
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -716,7 +716,7 @@ msgstr "Repita este PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -726,7 +726,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -772,7 +772,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -791,7 +791,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -819,7 +819,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -994,7 +994,7 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1002,127 +1002,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1132,47 +1132,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1180,7 +1180,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -1246,7 +1246,7 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1336,446 +1336,454 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, 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:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, 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:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1783,40 +1791,19 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
-"acabar con un '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2414,7 +2401,7 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -2690,51 +2677,51 @@ msgstr "%s: problema lectura del bloque de clave: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2746,17 +2733,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2766,46 +2753,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2814,11 +2801,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2827,11 +2814,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2840,43 +2827,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2884,11 +2871,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2898,31 +2885,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2931,76 +2918,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 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:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3008,11 +2995,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3020,181 +3007,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "establecer preferencias para todos los ID seleccionados"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3205,221 +3198,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notaci�n: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3427,17 +3425,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3445,7 +3443,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3454,55 +3452,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3511,171 +3509,181 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notaci�n de firma: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "�Sobreescribir? (s/N) "
+
+#: g10/keyedit.c:4363
 #, 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:4180
+#: g10/keyedit.c:4421
 #, 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:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3702,147 +3710,147 @@ msgstr "demasiadas preferencias de compresi�n\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, 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:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, 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:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3858,7 +3866,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3874,38 +3882,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3913,11 +3921,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:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3933,44 +3941,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3981,7 +3989,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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 "
@@ -3998,23 +4006,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4022,12 +4030,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4039,7 +4047,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4052,50 +4060,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4103,12 +4111,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4116,7 +4124,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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4124,25 +4132,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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, 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:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4163,49 +4171,41 @@ msgstr "Pol�tica de firmas: "
 msgid "Critical preferred keyserver: "
 msgstr "Servidor de claves cr�tico preferido: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "ilegible"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
@@ -4523,118 +4523,118 @@ msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -5467,30 +5467,30 @@ msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5498,7 +5498,7 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5507,23 +5507,23 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5531,15 +5531,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -5798,125 +5798,121 @@ msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 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:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 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:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, 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:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5924,7 +5920,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6267,6 +6263,29 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, "
+#~ "y acabar con un '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
+
+#~ msgid "not human readable"
+#~ msgstr "ilegible"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "lee opciones del fichero"
@@ -6747,9 +6766,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "   signed by %08lX at %s%s\n"
 #~ msgstr "   firmada por %08lX el %s%s\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Notaci�n: "
-
 #~ msgid "Policy: "
 #~ msgstr "Pol�tica: "
 
diff --git a/po/et.po b/po/et.po
index b9485a5a8..894c6f300 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -76,9 +76,9 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -391,15 +391,15 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -602,7 +602,7 @@ msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -611,7 +611,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "K�sklus> "
 
@@ -687,7 +687,7 @@ msgstr "vastuolulised k�sud\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -732,7 +732,7 @@ msgstr "Korrake parooli: "
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -742,7 +742,7 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -791,7 +791,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -810,7 +810,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -837,7 +837,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1011,7 +1011,7 @@ msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1019,128 +1019,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1150,51 +1150,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1252,7 +1252,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "�iffer: "
 
@@ -1260,7 +1260,7 @@ msgstr "�iffer: "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Pakkimine: "
 
@@ -1344,493 +1344,480 @@ msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
-"ning l�pus peab olema '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2412,7 +2399,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
@@ -2691,51 +2678,51 @@ msgstr "viga `%s' loomisel: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2748,63 +2735,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2813,11 +2800,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2826,11 +2813,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2839,54 +2826,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2896,32 +2883,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2930,100 +2917,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3031,11 +3018,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3043,201 +3030,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3245,236 +3237,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Noteering: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3482,19 +3479,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3502,7 +3499,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3511,55 +3508,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3568,177 +3565,187 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Allkirja noteerimine: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Kirjutan �le (j/E)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3768,149 +3775,149 @@ msgstr "liiga palju `%c' eelistusi\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3926,7 +3933,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3942,40 +3949,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3983,12 +3990,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4004,44 +4011,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4052,7 +4059,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4067,23 +4074,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4091,12 +4098,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4108,7 +4115,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4120,50 +4127,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4173,43 +4180,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, 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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, 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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -4230,50 +4237,42 @@ msgstr "Allkirja poliitika: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "pole inimese poolt loetav"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4591,118 +4590,118 @@ msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -5542,30 +5541,30 @@ msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5573,7 +5572,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5582,38 +5581,38 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -5875,129 +5874,125 @@ msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6315,6 +6310,29 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
+#~ "ning l�pus peab olema '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
+
+#~ msgid "not human readable"
+#~ msgstr "pole inimese poolt loetav"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "loe v�tmed failist"
@@ -6942,9 +6960,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Noteering: "
-
 #~ msgid "Policy: "
 #~ msgstr "Poliis: "
 
diff --git a/po/fi.po b/po/fi.po
index 67d73129b..1a4aa7821 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -56,10 +56,10 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -93,9 +93,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -412,15 +412,15 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -598,8 +598,8 @@ msgstr "   (%d) RSA (vain salaus)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -623,7 +623,7 @@ msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -632,7 +632,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -689,7 +689,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Komento> "
 
@@ -708,7 +708,7 @@ msgstr "ristiriitainen komento\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -753,7 +753,7 @@ msgstr "Toista salasana: "
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -763,7 +763,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -812,7 +812,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -831,7 +831,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -857,7 +857,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1038,128 +1038,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1169,51 +1169,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1222,7 +1222,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1272,7 +1272,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -1280,7 +1280,7 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Pakkaus: "
 
@@ -1364,494 +1364,481 @@ msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
-"välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2444,7 +2431,7 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -2725,52 +2712,52 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2783,63 +2770,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2848,13 +2835,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2863,11 +2850,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2876,55 +2863,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2933,32 +2920,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2967,100 +2954,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3068,11 +3055,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3080,201 +3067,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3282,236 +3274,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notaatio: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3519,19 +3516,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3539,7 +3536,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3548,55 +3545,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, 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:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3606,179 +3603,189 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 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:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Allekirjoitusnotaatio: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Ylikirjoita (k/E)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, 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:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, 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:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, 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:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, 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:4704
+#: g10/keyedit.c:4945
 #, 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:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3810,149 +3817,149 @@ msgstr "liian monta \"%c\" valintaa\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3968,7 +3975,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3984,40 +3991,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4025,12 +4032,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4048,44 +4055,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4096,7 +4103,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4111,23 +4118,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4135,12 +4142,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4152,7 +4159,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4164,50 +4171,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4216,12 +4223,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4229,7 +4236,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4237,26 +4244,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4277,50 +4284,42 @@ msgstr "Allekirjoituskäytäntö: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "ei ihmisten luettavissa"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4642,122 +4641,122 @@ msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, 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:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -5612,35 +5611,35 @@ msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -tyyliset)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROITUS: %%-laajennus ei onnistu (liian suuri).  Käytetään "
 "laajentamatonta.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
 "tyyliset)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5648,7 +5647,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5657,40 +5656,40 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -5954,129 +5953,125 @@ msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6394,6 +6389,29 @@ 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"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
+#~ "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
+
+#~ msgid "not human readable"
+#~ msgstr "ei ihmisten luettavissa"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "lue asetukset tiedostosta"
@@ -7027,9 +7045,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX luotu: %s vanhenee: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Notaatio: "
-
 #~ msgid "Policy: "
 #~ msgstr "Käytäntö: "
 
diff --git a/po/fr.po b/po/fr.po
index 5954a1576..b36c7a98f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -45,10 +45,10 @@ msgstr "�criture de la cl� secr�te dans `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -83,9 +83,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -402,14 +402,14 @@ msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
@@ -579,8 +579,8 @@ msgstr "   (2) Cl� de chiffrement\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -600,7 +600,7 @@ msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 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:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -608,7 +608,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -662,7 +662,7 @@ msgstr "menu pour changer ou d�verrouiller le PIN"
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Commande> "
 
@@ -678,7 +678,7 @@ msgstr "Les commandes d'administration sont permises\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -724,7 +724,7 @@ msgstr "R�p�tez ce code PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -734,7 +734,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -780,7 +780,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -800,7 +800,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -831,7 +831,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1009,7 +1009,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,127 +1017,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1147,51 +1147,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1199,7 +1199,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1251,7 +1251,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
@@ -1259,7 +1259,7 @@ msgstr "Chiffrement: "
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compression: "
 
@@ -1367,503 +1367,491 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, 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:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, 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:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, 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:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, 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:3468
+#: g10/gpg.c:3440
 #, 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:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"le nom d'une notation ne doit comporter que des caract�res imprimables\n"
-"ou des espaces, et se terminer par un signe '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -2464,7 +2452,7 @@ msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -2746,51 +2734,51 @@ msgstr "ressource bloc de cl�s `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2802,17 +2790,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2822,47 +2810,47 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2871,11 +2859,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2884,13 +2872,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2899,43 +2887,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2943,11 +2931,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2957,31 +2945,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2990,92 +2978,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 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:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3084,190 +3072,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
+"s�lectionn�"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3279,224 +3275,232 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3504,17 +3508,17 @@ 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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3523,7 +3527,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3533,55 +3537,55 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3591,180 +3595,190 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 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:4060
+#: g10/keyedit.c:4111
 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notation de signature: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "R��crire par-dessus ? (o/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, 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:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3794,149 +3808,149 @@ 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:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, 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:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, 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:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3952,7 +3966,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3968,38 +3982,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4007,11 +4021,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:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4027,44 +4041,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4075,7 +4089,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
@@ -4091,23 +4105,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4116,12 +4130,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4135,7 +4149,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4147,52 +4161,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, 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:2983
+#: g10/keygen.c:3032
 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:2994
+#: g10/keygen.c:3043
 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"
@@ -4201,13 +4215,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, 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:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4215,7 +4229,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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4223,26 +4237,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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, 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:3438
+#: g10/keygen.c:3487
 #, 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:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -4263,49 +4277,41 @@ msgstr "Politique de signature: "
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de cl�s critique favori: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "illisible par un humain"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
@@ -4633,104 +4639,104 @@ msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4738,16 +4744,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -5609,38 +5615,38 @@ msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre des donn�es de notation dans des signatures v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossible de mettres des donn�es de notation dans des signatures de\n"
 "cl�s v3 (de style PGP 2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
 "(cha�ne trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre une URL de politique dans des signatures v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre une URL de politique dans des signatures de cl� v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5648,7 +5654,7 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5657,23 +5663,23 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5681,17 +5687,17 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -5959,125 +5965,121 @@ 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:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, 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:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6085,7 +6087,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6406,5 +6408,29 @@ msgstr ""
 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
+#~ "ou des espaces, et se terminer par un signe '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
+
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr ""
+#~ "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr ""
+#~ "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
+
+#~ msgid "not human readable"
+#~ msgstr "illisible par un humain"
+
 #~ msgid "expired: %s)"
 #~ msgstr "expir�e: %s)"
diff --git a/po/gl.po b/po/gl.po
index 1fd23eea9..a76477bef 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "gravando a chave secreta en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -76,9 +76,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -395,15 +395,15 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -581,8 +581,8 @@ msgstr "   (%d) RSA (s� cifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -606,7 +606,7 @@ msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -615,7 +615,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -672,7 +672,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Comando> "
 
@@ -691,7 +691,7 @@ msgstr "comandos conflictivos\n"
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -739,7 +739,7 @@ msgstr "Repita o contrasinal: "
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -749,7 +749,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -799,7 +799,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -818,7 +818,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -846,7 +846,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1020,7 +1020,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1028,128 +1028,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1159,51 +1159,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1263,7 +1263,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1271,7 +1271,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1355,497 +1355,484 @@ msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, 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:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, 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:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, 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:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, 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:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, 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:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
-"rematar en '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2427,7 +2414,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
@@ -2718,51 +2705,51 @@ msgstr "erro ao crear `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2774,63 +2761,63 @@ 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:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2839,11 +2826,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2852,11 +2839,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2865,54 +2852,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2921,32 +2908,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2955,100 +2942,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3056,11 +3043,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3068,205 +3055,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+"seleccionados? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3274,238 +3268,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notaci�n: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3513,19 +3512,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3533,7 +3532,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3542,57 +3541,57 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3602,182 +3601,192 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notaci�n de sinaturas: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "�Sobrescribir? (s/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3808,149 +3817,149 @@ msgstr "demasiadas preferencias `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, 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:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3966,7 +3975,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3982,40 +3991,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4023,12 +4032,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4045,44 +4054,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4093,7 +4102,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
@@ -4109,23 +4118,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4133,12 +4142,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4150,7 +4159,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4162,50 +4171,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 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:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4215,12 +4224,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4228,7 +4237,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4236,26 +4245,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4276,50 +4285,42 @@ msgstr "Normativa de sinaturas: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "non lexible por humanos"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4638,119 +4639,119 @@ msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -5608,80 +5609,80 @@ msgstr ""
 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"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP 2."
 "x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
 "expandir.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo PGP 2."
 "x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -5948,129 +5949,125 @@ msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, 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:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6389,6 +6386,29 @@ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e "
+#~ "debe rematar en '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
+
+#~ msgid "not human readable"
+#~ msgstr "non lexible por humanos"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "le-las opci�ns dun ficheiro"
@@ -7021,9 +7041,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Notaci�n: "
-
 #~ msgid "Policy: "
 #~ msgstr "Normativa: "
 
diff --git a/po/hu.po b/po/hu.po
index 171da1894..81e360e93 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -393,15 +393,15 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -579,8 +579,8 @@ msgstr "   (%d) RSA (csak titkos�t�s)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -604,7 +604,7 @@ msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -613,7 +613,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -670,7 +670,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Parancs> "
 
@@ -689,7 +689,7 @@ msgstr "Egym�snak ellentmond� parancsok!\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -734,7 +734,7 @@ msgstr "Ism�telje meg a jelsz�t: "
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -744,7 +744,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -793,7 +793,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -812,7 +812,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -838,7 +838,7 @@ msgid ""
 "WARNING: 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:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1009,7 +1009,7 @@ msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,128 +1017,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1148,51 +1148,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1200,7 +1200,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
@@ -1258,7 +1258,7 @@ msgstr "Rejtjelez� (cipher): "
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
@@ -1342,494 +1342,481 @@ msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, 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:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, 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:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, 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:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
-"jellel kell befejez�dj�n.\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -2419,7 +2406,7 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -2702,51 +2689,51 @@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2759,63 +2746,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2824,11 +2811,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2837,11 +2824,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,54 +2837,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2906,32 +2893,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2940,100 +2927,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3041,11 +3028,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3053,201 +3040,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3255,236 +3247,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 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:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Jel�l�s: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3492,19 +3489,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3512,7 +3509,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3522,55 +3519,55 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, 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:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3580,179 +3577,189 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 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:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 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:3475
+#: g10/keyedit.c:3526
 #, 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:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 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:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Al��r�s-jel�l�s: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Fel�l�rjam (i/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, 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:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, 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:4704
+#: g10/keyedit.c:4945
 #, 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:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3782,149 +3789,149 @@ msgstr "T�l sok \"%c\" preferencia.\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3940,7 +3947,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3956,40 +3963,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:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3997,12 +4004,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4019,44 +4026,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, 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:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4067,7 +4074,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4082,24 +4089,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4107,12 +4114,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4124,7 +4131,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4136,50 +4143,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 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:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4189,46 +4196,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, 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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, 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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, 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:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -4249,50 +4256,42 @@ msgstr "Al��r�si elj�r�sm�d: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "nem olvashat� forma"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4616,119 +4615,119 @@ msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, 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:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -5579,31 +5578,31 @@ msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5612,7 +5611,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5622,22 +5621,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5645,16 +5644,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -5918,129 +5917,125 @@ msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 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:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, 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:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6358,6 +6353,29 @@ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, "
+#~ "�s = jellel kell befejez�dj�n.\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
+
+#~ msgid "not human readable"
+#~ msgstr "nem olvashat� forma"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "opci�k beolvas�sa �llom�nyb�l"
@@ -6989,9 +7007,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  l�trehozva: %s lej�r: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Jel�l�s: "
-
 #~ msgid "Policy: "
 #~ msgstr "Elj�r�sm�d: "
 
diff --git a/po/id.po b/po/id.po
index 2f7e1b208..513531e0e 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -395,15 +395,15 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -581,8 +581,8 @@ msgstr "  (%d) RSA (hanya enkripsi)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -606,7 +606,7 @@ msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -615,7 +615,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -672,7 +672,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Perintah> "
 
@@ -691,7 +691,7 @@ msgstr "perintah saling konflik\n"
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -736,7 +736,7 @@ msgstr "Ulangi passphrase: "
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -746,7 +746,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -795,7 +795,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -814,7 +814,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -842,7 +842,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1021,128 +1021,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1152,51 +1152,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1204,7 +1204,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1254,7 +1254,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1262,7 +1262,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Kompresi: "
 
@@ -1346,502 +1346,489 @@ msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
-"dan diakhiri dengan sebuah '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2434,7 +2421,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -2714,51 +2701,51 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2771,63 +2758,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2836,11 +2823,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2849,13 +2836,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2864,43 +2851,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2908,11 +2895,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2922,32 +2909,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2956,100 +2943,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3057,11 +3044,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3069,201 +3056,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Perbarui preferensi untuk user ID terpilih?"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3271,236 +3263,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notasi: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3508,19 +3505,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3528,7 +3525,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3538,55 +3535,55 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3596,182 +3593,192 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notasi signature: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Ditimpa (y/T)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3801,149 +3808,149 @@ msgstr "terlalu banyak preferensi `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3959,7 +3966,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3975,40 +3982,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4016,12 +4023,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4037,44 +4044,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4084,7 +4091,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4099,23 +4106,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4123,12 +4130,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4141,7 +4148,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4153,50 +4160,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4206,45 +4213,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, 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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, 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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4265,50 +4272,42 @@ msgstr "Kebijakan signature: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "tidak dapat dibaca manusia"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4626,119 +4625,119 @@ msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -5584,32 +5583,32 @@ msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5617,7 +5616,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5626,39 +5625,39 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -5921,129 +5920,125 @@ msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6362,6 +6357,29 @@ 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"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau "
+#~ "spasi, dan diakhiri dengan sebuah '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
+
+#~ msgid "not human readable"
+#~ msgstr "tidak dapat dibaca manusia"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "baca pilihan dari file"
@@ -6989,9 +7007,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Notasi: "
-
 #~ msgid "Policy: "
 #~ msgstr "Kebijakan: "
 
diff --git a/po/it.po b/po/it.po
index ff1f55f43..c8d4d825b 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -396,15 +396,15 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -583,8 +583,8 @@ msgstr "   (%d) RSA (cifra solo)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -608,7 +608,7 @@ msgstr "Parti della chiave segreta non sono disponibili.\n"
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -617,7 +617,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -674,7 +674,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Comando> "
 
@@ -693,7 +693,7 @@ msgstr "comandi in conflitto\n"
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -738,7 +738,7 @@ msgstr "Ripeti la passphrase: "
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -748,7 +748,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -797,7 +797,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -817,7 +817,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -848,7 +848,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1024,7 +1024,7 @@ msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1032,128 +1032,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1163,51 +1163,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1265,7 +1265,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -1273,7 +1273,7 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compressione: "
 
@@ -1357,499 +1357,486 @@ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
-"spazi e terminare con un '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "il valore di una nota non deve usare caratteri di controllo\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2444,7 +2431,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -2727,51 +2714,51 @@ msgstr "errore creando `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2784,63 +2771,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2849,11 +2836,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2862,11 +2849,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2875,43 +2862,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2919,11 +2906,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2933,32 +2920,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2967,100 +2954,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3068,11 +3055,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3080,201 +3067,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3282,236 +3274,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Nota: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3520,19 +3517,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3541,7 +3538,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3550,56 +3547,56 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3609,185 +3606,195 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Annotazione della firma: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Sovrascrivo (s/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3818,149 +3825,149 @@ msgstr "ci sono troppe preferenze `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3976,7 +3983,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3992,40 +3999,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4033,12 +4040,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4055,44 +4062,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4103,7 +4110,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4118,23 +4125,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:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4142,12 +4149,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4159,7 +4166,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4171,50 +4178,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4224,12 +4231,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4237,7 +4244,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4245,26 +4252,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4285,50 +4292,42 @@ msgstr "Politica di firma: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "non leggibile"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4649,118 +4648,118 @@ msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -5628,34 +5627,34 @@ msgstr ""
 "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
 "subchiave\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
 "PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5664,7 +5663,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5674,39 +5673,39 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -5970,129 +5969,125 @@ msgstr "il trust record %lu non � del tipo richiesto %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6411,6 +6406,29 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
+#~ "spazi e terminare con un '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "il valore di una nota non deve usare caratteri di controllo\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
+
+#~ msgid "not human readable"
+#~ msgstr "non leggibile"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "leggi le opzioni dal file"
@@ -7042,9 +7060,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Nota: "
-
 #~ msgid "Policy: "
 #~ msgstr "Policy: "
 
diff --git a/po/ja.po b/po/ja.po
index c8f953877..126f49d5e 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,9 +79,9 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
@@ -390,14 +390,14 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "�����? "
 
@@ -563,8 +563,8 @@ msgstr "   (2) �Ź沽��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -584,7 +584,7 @@ msgstr "������̩��ʬ��̵���Ǥ�\n"
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -592,7 +592,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -644,7 +644,7 @@ msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "���ޥ��> "
 
@@ -660,7 +660,7 @@ msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -707,7 +707,7 @@ msgstr "PIN�������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -717,7 +717,7 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -763,7 +763,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -782,7 +782,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -807,7 +807,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -972,7 +972,7 @@ msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -980,127 +980,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1110,55 +1110,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
@@ -1225,7 +1225,7 @@ msgstr "�Ź�ˡ: "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "����: "
 
@@ -1309,482 +1309,470 @@ msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2369,7 +2357,7 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
@@ -2644,51 +2632,51 @@ msgstr "��%s�פκ������顼: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2699,17 +2687,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2718,46 +2706,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2766,11 +2754,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2779,11 +2767,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2792,53 +2780,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 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:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2847,32 +2835,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2881,75 +2869,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2957,11 +2945,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2970,201 +2958,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3172,223 +3165,231 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"���ץ����:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3396,17 +3397,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3414,7 +3415,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3423,55 +3424,55 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3480,171 +3481,181 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "��̾����: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "��񤭤��ޤ���? (y/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3671,147 +3682,147 @@ msgstr "¿�����밵������\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3827,7 +3838,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3843,40 +3854,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3884,11 +3895,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3904,44 +3915,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3952,7 +3963,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -3967,23 +3978,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3991,12 +4002,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4008,7 +4019,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4019,50 +4030,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4071,42 +4082,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4127,49 +4138,41 @@ msgstr "��̾�ݥꥷ��: "
 msgid "Critical preferred keyserver: "
 msgstr "����������������: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "�ͤˤ��ɤ�ޤ���"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
@@ -4481,118 +4484,118 @@ msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -5401,69 +5404,69 @@ msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -5721,130 +5724,126 @@ msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, 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:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6161,6 +6160,28 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\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"
+
+#, fuzzy
+#~ 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 "expired: %s)"
 #~ msgstr "��λ: %s)"
 
diff --git a/po/pl.po b/po/pl.po
index d8bfdc9d6..2334e8aca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -50,10 +50,10 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -87,9 +87,9 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -410,15 +410,15 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -598,8 +598,8 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -623,7 +623,7 @@ msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -632,7 +632,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -689,7 +689,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Polecenie> "
 
@@ -708,7 +708,7 @@ msgstr "sprzeczne polecenia\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -756,7 +756,7 @@ msgstr "Powt�rz has�o: "
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -766,7 +766,7 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -815,7 +815,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -835,7 +835,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -862,7 +862,7 @@ msgid ""
 "WARNING: 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:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1032,7 +1032,7 @@ msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1040,128 +1040,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1171,51 +1171,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1223,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1274,7 +1274,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -1282,7 +1282,7 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Kompresji: "
 
@@ -1378,497 +1378,484 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, fuzzy
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, fuzzy, 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:3037
+#: g10/gpg.c:3009
 #, fuzzy, 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:3042
+#: g10/gpg.c:3014
 #, fuzzy, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
-"i musi ko�czy� si� ,,=''\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -2451,7 +2438,7 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -2735,52 +2722,52 @@ msgstr "b��d tworzenia `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2793,63 +2780,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2858,11 +2845,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2871,11 +2858,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2884,56 +2871,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2942,32 +2929,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2976,99 +2963,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3076,11 +3063,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3088,203 +3075,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3292,237 +3285,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 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:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Adnotacja: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3530,19 +3528,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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 +3549,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3560,54 +3558,54 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3617,179 +3615,189 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, fuzzy
 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Adnotacje podpisu: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Nadpisa� (t/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, 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 0x%08lX (id %d).\n"
@@ -3819,149 +3827,149 @@ msgstr "zbyt wiele `%c' ustawie�\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3977,7 +3985,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:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3993,40 +4001,40 @@ 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:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4034,12 +4042,12 @@ 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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4056,44 +4064,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4104,7 +4112,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
@@ -4121,37 +4129,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 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:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4163,7 +4171,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4179,50 +4187,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4231,12 +4239,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4244,7 +4252,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4252,27 +4260,27 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
@@ -4293,50 +4301,42 @@ msgstr "Regulamin podpisu: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "nieczytelne dla cz�owieka"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4654,120 +4654,120 @@ msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -5622,33 +5622,33 @@ msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5656,7 +5656,7 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5665,37 +5665,37 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -5960,129 +5960,125 @@ msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@ -6400,6 +6396,30 @@ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i "
+#~ "podkre�lenia, \n"
+#~ "i musi ko�czy� si� ,,=''\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
+
+#~ msgid "not human readable"
+#~ msgstr "nieczytelne dla cz�owieka"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "wczytanie opcji z pliku"
@@ -7042,9 +7062,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  utworzony: %s, wygasa: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Adnotacja: "
-
 #~ msgid "Policy: "
 #~ msgstr "Regulamin: "
 
diff --git a/po/pt.po b/po/pt.po
index ad5282013..b6fbd1dc4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "a escrever chave privada para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,9 +80,9 @@ msgstr "imposs�vel ler `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -394,15 +394,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -580,8 +580,8 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -605,7 +605,7 @@ msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -614,7 +614,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -671,7 +671,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Comando> "
 
@@ -690,7 +690,7 @@ msgstr "comandos em conflito\n"
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -735,7 +735,7 @@ msgstr "Repita a frase secreta: "
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,7 +745,7 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -794,7 +794,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -813,7 +813,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -841,7 +841,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1011,7 +1011,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1019,128 +1019,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1150,55 +1150,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1256,7 +1256,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1264,7 +1264,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compress�o: "
 
@@ -1348,497 +1348,484 @@ msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, 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:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, 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:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
-"terminar com um '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2426,7 +2413,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -2708,51 +2695,51 @@ msgstr "erro ao criar `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2765,63 +2752,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2830,11 +2817,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2843,12 +2830,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2857,55 +2844,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2915,31 +2902,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2948,100 +2935,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3049,11 +3036,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3061,203 +3048,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3265,237 +3258,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Nota��o: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3503,25 +3501,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3530,56 +3528,56 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3588,178 +3586,188 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 #, 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, 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:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, 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:4060
+#: g10/keyedit.c:4111
 #, 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Nota��o de assinatura: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Escrever por cima (s/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3790,149 +3798,149 @@ msgstr "demasiadas prefer�ncias `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3948,7 +3956,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3964,40 +3972,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4005,12 +4013,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4028,44 +4036,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 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:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4076,7 +4084,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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 "
@@ -4093,23 +4101,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4117,12 +4125,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4134,7 +4142,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4146,50 +4154,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4198,12 +4206,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4211,7 +4219,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4219,26 +4227,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4259,50 +4267,42 @@ msgstr "Politica de assinatura: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "n�o leg�vel por humanos"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4621,122 +4621,122 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5583,33 +5583,33 @@ msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 #, 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
 "utilizar n�o expandida.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5617,7 +5617,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5626,21 +5626,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5648,15 +5648,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -5920,131 +5920,127 @@ msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 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:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 #, 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:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6363,6 +6359,29 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+#~ "terminar com um '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+
+#~ msgid "not human readable"
+#~ msgstr "n�o leg�vel por humanos"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "ler op��es do ficheiro"
@@ -6996,9 +7015,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Nota��o: "
-
 #~ msgid "Policy: "
 #~ msgstr "Pol�tica: "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 794df08bf..73b1e301c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -47,10 +47,10 @@ msgstr "escrevendo certificado privado para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -84,9 +84,9 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -399,15 +399,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -586,8 +586,8 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -611,7 +611,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -620,7 +620,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -677,7 +677,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Comando> "
 
@@ -697,7 +697,7 @@ msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -745,7 +745,7 @@ msgstr "Repita a frase secreta: "
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -755,7 +755,7 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -805,7 +805,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -824,7 +824,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -849,7 +849,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1025,134 +1025,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1162,61 +1162,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1266,7 +1266,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr ""
 
@@ -1274,7 +1274,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
@@ -1359,506 +1359,491 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 #, 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:2921
+#: g10/gpg.c:2893
 #, 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, 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:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4031
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
-"terminar com '='\n"
-
-#: g10/gpg.c:4039
-#, fuzzy
-msgid "a user notation name must contain the '@' character\n"
-msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2392,7 +2377,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -2670,51 +2655,51 @@ msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2733,172 +2718,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, 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:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "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 ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2907,90 +2892,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2998,12 +2983,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3011,203 +2996,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
+
+#: g10/keyedit.c:1430
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3215,497 +3205,512 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Nota��o: "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 #, 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:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 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:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, 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:4060
+#: g10/keyedit.c:4111
 #, 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Nota��o: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Sobrescrever (s/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 #, 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:4359
+#: g10/keyedit.c:4600
 #, 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3738,151 +3743,151 @@ msgstr "Prefer�ncias demais"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3898,7 +3903,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3915,40 +3920,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3956,12 +3961,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -3978,44 +3983,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 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:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4026,7 +4031,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4041,24 +4046,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 #, 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4066,12 +4071,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4083,7 +4088,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4095,50 +4100,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4147,12 +4152,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4160,7 +4165,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4168,26 +4173,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4210,56 +4215,48 @@ msgstr "assinatura %s de: %s\n"
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr ""
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 #, 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:1530
+#: g10/keylist.c:1514
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4579,121 +4576,121 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5541,69 +5538,69 @@ msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -5870,131 +5867,127 @@ msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6319,6 +6312,28 @@ 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados "
+#~ "e terminar com '='\n"
+
+#, fuzzy
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+
+#, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "ler op��es do arquivo"
 
@@ -6917,9 +6932,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid " (default)"
 #~ msgstr "(o padr�o � 1)"
 
-#~ msgid "Notation: "
-#~ msgstr "Nota��o: "
-
 #~ msgid "Policy: "
 #~ msgstr "Pol�tica: "
 
diff --git a/po/ro.po b/po/ro.po
index 6910e9bbc..e0132d5d2 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -44,10 +44,10 @@ msgstr "scriu cheia secret� �n `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -82,9 +82,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -395,14 +395,14 @@ msgstr "cardul OpenPGP nu e disponibil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
@@ -568,8 +568,8 @@ msgstr "   (2) Cheie de cifrare\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -589,7 +589,7 @@ msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -597,7 +597,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -649,7 +649,7 @@ msgstr "meniu pentru a schimba sau debloca PIN-ul"
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Comand�> "
 
@@ -665,7 +665,7 @@ msgstr "Sunt permise comenzi administrare\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -712,7 +712,7 @@ msgstr "Repeta�i acest PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -722,7 +722,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -770,7 +770,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -789,7 +789,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -818,7 +818,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -987,7 +987,7 @@ msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +995,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1227,7 +1227,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -1235,7 +1235,7 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Compresie: "
 
@@ -1335,493 +1335,480 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
-"�i s� se termine cu un '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr ""
-"o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2422,7 +2409,7 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
@@ -2699,51 +2686,51 @@ msgstr "resurs� keyblock `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2754,17 +2741,17 @@ 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:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2774,47 +2761,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2823,11 +2810,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,12 +2823,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,43 +2837,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2894,11 +2881,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2909,31 +2896,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2942,76 +2929,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 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:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3019,11 +3006,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3031,184 +3018,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3220,223 +3213,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 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:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Nota�ie:"
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3445,17 +3443,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3464,7 +3462,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3473,54 +3471,54 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3530,174 +3528,184 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 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:4060
+#: g10/keyedit.c:4111
 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Notare semn�tur�: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Suprascriu? (d/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 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:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, 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"
@@ -3724,147 +3732,147 @@ msgstr "prea multe preferin�e de compresie\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, 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:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, 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:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3880,7 +3888,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3896,38 +3904,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3935,11 +3943,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:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3956,44 +3964,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4004,7 +4012,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4019,23 +4027,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4043,12 +4051,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4059,7 +4067,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:1835
+#: g10/keygen.c:1884
 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"
@@ -4071,50 +4079,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:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4124,12 +4132,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4137,7 +4145,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4145,25 +4153,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, 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:3464
+#: g10/keygen.c:3513
 #, 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"
@@ -4184,49 +4192,41 @@ msgstr "Politic� de semn�turi: "
 msgid "Critical preferred keyserver: "
 msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "ilizibil"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
@@ -4542,119 +4542,119 @@ msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, 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:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -5500,30 +5500,30 @@ msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5531,7 +5531,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5540,21 +5540,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5562,15 +5562,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -5828,127 +5828,123 @@ 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:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, 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:2288
+#: g10/trustdb.c:2283
 #, 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:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6265,6 +6261,31 @@ 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau "
+#~ "spa�ii �i s� se termine cu un '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr ""
+#~ "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr ""
+#~ "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de "
+#~ "control\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+
+#~ msgid "not human readable"
+#~ msgstr "ilizibil"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "cite�te op�iuni din fi�ier"
@@ -6737,9 +6758,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "   signed by %08lX at %s%s\n"
 #~ msgstr "   semnat� de %08lX pe %s%s\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Nota�ie:"
-
 #~ msgid "Policy: "
 #~ msgstr "Politica: "
 
diff --git a/po/ru.po b/po/ru.po
index a134037d4..7fc46c984 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "сохранение секретного ключа в `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -391,14 +391,14 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
@@ -564,8 +564,8 @@ msgstr "   (2) Ключ шифрования\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -585,7 +585,7 @@ msgstr "секретные части ключа недоступны\n"
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -593,7 +593,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -647,7 +647,7 @@ msgstr "меню изменения или разблокировки PIN"
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN  и показать все данные"
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Команда> "
 
@@ -663,7 +663,7 @@ msgstr "Команды администрирования разрешены\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -708,7 +708,7 @@ msgstr "Повторите ввод PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -718,7 +718,7 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -764,7 +764,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -783,7 +783,7 @@ msgstr "используемый алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -809,7 +809,7 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -974,7 +974,7 @@ msgstr "ВНИМАНИЕ: секретный ключ %s не имеет про�
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -982,127 +982,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1214,7 +1214,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
@@ -1222,7 +1222,7 @@ msgstr "Симметричные шифры: "
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
@@ -1315,492 +1315,480 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
 # test it
-#: g10/gpg.c:2505
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
 # test it
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"имя примечания должно содержать только печатные символы или пробелы,и "
-"заканчиваться знаком '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "имя примечания пользователя должно содержать '@' символ\n"
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "имя пользователя не должно содержать более одного символа '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "значение примечания не должно содержать управляющие символы\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2395,7 +2383,7 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
@@ -2669,51 +2657,51 @@ msgstr ""
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2725,17 +2713,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2746,47 +2734,47 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\"  подписываем."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2795,11 +2783,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2808,11 +2796,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2821,55 +2809,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2879,31 +2867,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2912,74 +2900,74 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2987,11 +2975,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2999,180 +2987,186 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "установить список предпочтений для выбранных User ID"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3184,221 +3178,229 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент - имя файла\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"Параметры:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3406,18 +3408,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3425,7 +3427,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3434,54 +3436,54 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3490,170 +3492,180 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Примечание к подписи"
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Перезаписать (y/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -3680,147 +3692,147 @@ msgstr "слишком много предпочтений для методов
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3836,7 +3848,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3852,38 +3864,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3891,11 +3903,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3910,44 +3922,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3958,7 +3970,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -3973,24 +3985,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3998,12 +4010,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4015,7 +4027,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4027,50 +4039,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4078,45 +4090,45 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, 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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, 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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
@@ -4138,49 +4150,41 @@ msgstr "Политика подписи: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Критическое примечание к подписи: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "нечитаемо для человека"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4494,119 +4498,119 @@ msgstr "ЗАМЕТЬТЕ: отправитель требует \"только �
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
@@ -5444,29 +5448,29 @@ msgstr "ключ %s: нет подключа для подключа отзыв�
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5474,7 +5478,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5483,21 +5487,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5505,15 +5509,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -5773,121 +5777,117 @@ msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
 # check it
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5895,7 +5895,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6213,5 +6213,27 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\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 "expired: %s)"
 #~ msgstr "просрочен с: %s)"
diff --git a/po/sk.po b/po/sk.po
index 3c0511e6e..72c354eb6 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -39,10 +39,10 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -75,9 +75,9 @@ msgstr "nem��em ��ta� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -391,15 +391,15 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (len na �ifrovanie)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -602,7 +602,7 @@ msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -611,7 +611,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Pr�kaz> "
 
@@ -687,7 +687,7 @@ msgstr "konfliktn� pr�kazy\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -732,7 +732,7 @@ msgstr "Opakujte heslo: "
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -742,7 +742,7 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -791,7 +791,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -810,7 +810,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -836,7 +836,7 @@ msgid ""
 "WARNING: 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:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1009,7 +1009,7 @@ msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,128 +1017,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1148,55 +1148,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1257,7 +1257,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "�ifry: "
 
@@ -1265,7 +1265,7 @@ msgstr "�ifry: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Kompresia: "
 
@@ -1352,500 +1352,487 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, 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:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, 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:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, 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:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 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:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 #, 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 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:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 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:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
-"kon�i� s '='\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "hodnota mus� obsahova� znak '@'\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "hodnota mus� obsahova� znak '@'\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2435,7 +2422,7 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
@@ -2718,52 +2705,52 @@ msgstr "chyba pri vytv�ran� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2776,63 +2763,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2841,11 +2828,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2855,11 +2842,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2869,54 +2856,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2926,32 +2913,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2960,28 +2947,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2989,72 +2976,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3062,11 +3049,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3074,201 +3061,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3276,236 +3268,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Not�cie: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3513,19 +3510,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3533,7 +3530,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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3542,55 +3539,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3599,176 +3596,186 @@ 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:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 #, 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:3469
+#: g10/keyedit.c:3520
 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:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 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:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, 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:4060
+#: g10/keyedit.c:4111
 #, 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Podpisov� not�cia: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Prep�sa� (a/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, 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:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3799,149 +3806,149 @@ msgstr "pr�li� ve�a `%c' predvolieb\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, 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:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3957,7 +3964,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:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3973,40 +3980,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:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4014,12 +4021,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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4036,44 +4043,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4084,7 +4091,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4099,23 +4106,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4123,12 +4130,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4140,7 +4147,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4152,50 +4159,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, 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:2935
+#: g10/keygen.c:2984
 #, 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:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, 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:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4204,12 +4211,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4217,7 +4224,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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4225,26 +4232,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:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, 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"
@@ -4265,50 +4272,42 @@ msgstr "Podpisov� politika: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "nie je v priamo �itate�nom form�te"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4630,121 +4629,121 @@ msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -5591,30 +5590,30 @@ msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5622,7 +5621,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5631,39 +5630,39 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -5929,129 +5928,125 @@ msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, 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:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, 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"
@@ -6369,6 +6364,29 @@ msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 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"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo "
+#~ "medzery a kon�i� s '='\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
+
+#~ msgid "not human readable"
+#~ msgstr "nie je v priamo �itate�nom form�te"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "��ta� nastavenia zo s�boru"
@@ -7016,9 +7034,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  vytvoren�: %s platnos� do: %s"
 
-#~ msgid "Notation: "
-#~ msgstr "Not�cie: "
-
 #~ msgid "Policy: "
 #~ msgstr "Politika: "
 
diff --git a/po/sv.po b/po/sv.po
index 33f21ec8c..e43bcb8a4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -58,10 +58,10 @@ msgstr "skriver hemlig nyckel till \"%s\"\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -94,9 +94,9 @@ msgstr "kan inte läsa \"%s\": %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
@@ -417,15 +417,15 @@ msgstr "den hemliga nyckeln är inte tillgänglig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
@@ -602,8 +602,8 @@ msgstr "   (%d) RSA (endast kryptering)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -627,7 +627,7 @@ msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
@@ -636,7 +636,7 @@ msgstr "avsluta denna meny"
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "visa denna hjälp"
 
@@ -694,7 +694,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Kommando> "
 
@@ -711,7 +711,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
@@ -757,7 +757,7 @@ msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -767,7 +767,7 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -816,7 +816,7 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 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:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
@@ -835,7 +835,7 @@ msgstr "använderchiffer %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -864,7 +864,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1043,7 +1043,7 @@ msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1051,130 +1051,130 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 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:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 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:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1184,53 +1184,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1291,7 +1291,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Chiffer: "
 
@@ -1299,7 +1299,7 @@ msgstr "Chiffer: "
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Komprimering: "
 
@@ -1384,513 +1384,494 @@ msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "visa vilken nyckelring den listade nyckeln hör till"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, 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:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, 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:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen ä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:2913
+#: g10/gpg.c:2885
 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:2915
+#: g10/gpg.c:2887
 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:2917
+#: g10/gpg.c:2889
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt 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:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "felaktiga 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:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
-"understrykningstecken och sluta med ett likhetstecken\n"
-
-# user notation name??
-# Werner:
-# That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
-
-# user notation name??
-# Werner:
-# That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -2498,7 +2479,7 @@ msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
@@ -2790,51 +2771,51 @@ msgstr "Fel vid skapande av `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2848,63 +2829,63 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt på denna användare\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt på denna användare\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2913,11 +2894,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Will du göra om den till en egensignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2926,13 +2907,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 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) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2941,44 +2922,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, 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:847
+#: g10/keyedit.c:849
 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) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2986,11 +2967,11 @@ 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:889
+#: g10/keyedit.c:891
 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:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2999,33 +2980,33 @@ 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:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3034,14 +3015,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -3049,7 +3030,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -3057,7 +3038,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -3065,7 +3046,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3073,65 +3054,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3139,11 +3120,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3151,204 +3132,210 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 #, fuzzy
 msgid "select subkey N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "check signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1428
 #, fuzzy
-msgid "set preferred keyserver URL for the selected user IDs"
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr ""
+"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "disable key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 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:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3356,238 +3343,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "okänd signaturklass"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, 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:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 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:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Notering: "
+
+#: g10/keyedit.c:2630
 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 ett användar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3595,19 +3587,19 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3616,7 +3608,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3626,56 +3618,56 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 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:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "felaktigt skal"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3684,33 +3676,33 @@ msgstr ""
 "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
 "nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3718,152 +3710,162 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "Signaturnotering: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Skriv över (j/N)? "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, fuzzy, 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 0x%08lX (uid %d)\n"
@@ -3893,150 +3895,150 @@ msgstr "för många `%c' inställningar\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "skriver egensignatur\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 #, fuzzy
 msgid "Encrypt"
 msgstr "kryptera data"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, 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:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4053,7 +4055,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:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4069,40 +4071,40 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "felaktigt värde\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "Giltighetstiden för %s går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4110,12 +4112,12 @@ 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:1601
+#: g10/keygen.c:1650
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "\n"
@@ -4132,44 +4134,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Felaktigt tecken i namnet\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Felaktigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4180,7 +4182,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
 
@@ -4196,24 +4198,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4221,12 +4223,12 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4237,7 +4239,7 @@ msgstr ""
 "Jag kommer att göra det ändå. Du kan ändra din lösenmening när som helst\n"
 "om du använder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4249,50 +4251,50 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropi.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "den öppna och den  hemliga nyckeln är skapade och signerade.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4302,13 +4304,13 @@ msgstr ""
 "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n"
 "undernyckel för detta syfte.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4316,7 +4318,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4324,26 +4326,26 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4364,50 +4366,42 @@ msgstr "Signaturpolicy: "
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "VARNING: ogiltig noteringsdata hittades\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Viktig signaturnotation: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Signaturnotering: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "inte möjlig att läsa för människor"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4731,124 +4725,124 @@ msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \""
 
 # 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:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 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:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -5721,36 +5715,36 @@ msgstr ""
 "nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n"
 
 # notation data?
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till noteringar i signaturer gjorda med en v3-nyckel\n"
 "(PGP 2.x-typ)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en "
 "v3-nyckel (PGP 2.x-typ)\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, 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"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
 "2.x-typ)\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5758,7 +5752,7 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5767,23 +5761,23 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 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:836
+#: g10/sign.c:821
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5791,17 +5785,17 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 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:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
@@ -6070,133 +6064,129 @@ msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[spärrad]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[Giltighetstiden har gått ut]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "okänd"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, 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:597
+#: g10/trustdb.c:592
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "hittade inte den öppna nyckeln %08lX :%s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 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:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda "
 "nyckeln %08lX \n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6515,6 +6505,35 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
+#~ "understrykningstecken och sluta med ett likhetstecken\n"
+
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "VARNING: ogiltig noteringsdata hittades\n"
+
+#~ msgid "not human readable"
+#~ msgstr "inte möjlig att läsa för människor"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "läs inställningar från fil"
@@ -7059,9 +7078,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "   signed by %08lX at %s%s\n"
 #~ msgstr "  signerad av %08lX at %s%s\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Notering: "
-
 # finns det någon bra svensk översättning av policy?
 #~ msgid "Policy: "
 #~ msgstr "Policy: "
diff --git a/po/tr.po b/po/tr.po
index f59d95897..00be12637 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: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "gizli anahtarı `%s'e yazıyor\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -388,14 +388,14 @@ msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -561,8 +561,8 @@ msgstr "   (2) Şifreleme anahtarı\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -582,7 +582,7 @@ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -590,7 +590,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -642,7 +642,7 @@ msgstr "PIN değiştirmek için menü"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "Komut> "
 
@@ -658,7 +658,7 @@ msgstr "Yönetici komutlarına izin verilir\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -705,7 +705,7 @@ msgstr "Bu PIN'i tekrarlayın: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -715,7 +715,7 @@ 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:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -761,7 +761,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -780,7 +780,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -809,7 +809,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -977,7 +977,7 @@ msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -985,127 +985,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1115,51 +1115,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1219,7 +1219,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "Şifre: "
 
@@ -1227,7 +1227,7 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
@@ -1311,484 +1311,471 @@ msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 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:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, 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:2163
+#: g10/gpg.c:2131
 #, 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:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, 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:2405
+#: g10/gpg.c:2373
 #, 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:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, 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:2665
+#: g10/gpg.c:2637
 #, 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:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, 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:2788
+#: g10/gpg.c:2760
 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:2794
+#: g10/gpg.c:2766
 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:2800
+#: g10/gpg.c:2772
 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:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 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:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 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:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 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:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, 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:3037
+#: g10/gpg.c:3009
 #, 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:3042
+#: g10/gpg.c:3014
 #, 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:3138
+#: g10/gpg.c:3110
 #, 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:3149
+#: g10/gpg.c:3121
 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:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, 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:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 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:3197
+#: g10/gpg.c:3169
 #, 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:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 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:3248
+#: g10/gpg.c:3220
 #, 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:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, 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:3445
+#: g10/gpg.c:3417
 #, 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:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
-"sonuna bir '=' gelir.\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2375,7 +2362,7 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
@@ -2657,51 +2644,51 @@ msgstr "`%s' oluşturulurken hata: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 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:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2712,17 +2699,17 @@ 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:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2732,46 +2719,46 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2780,11 +2767,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,12 +2780,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2807,44 +2794,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2852,11 +2839,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2865,31 +2852,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2899,76 +2886,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 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:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2976,13 +2963,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2990,186 +2977,192 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3181,235 +3174,240 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr "Niteleme: "
+
+#: g10/keyedit.c:2630
 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:2638
+#: g10/keyedit.c:2689
 #, 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:2659
+#: g10/keyedit.c:2710
 #, 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:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3417,17 +3415,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:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3436,7 +3434,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3445,55 +3443,55 @@ 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:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 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:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3503,182 +3501,192 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 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:3321
+#: g10/keyedit.c:3372
 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:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 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:3402
+#: g10/keyedit.c:3453
 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:3408
+#: g10/keyedit.c:3459
 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:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 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:3482
+#: g10/keyedit.c:3533
 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:3528
+#: g10/keyedit.c:3579
 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:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, 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:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 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:4060
+#: g10/keyedit.c:4111
 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:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "imza niteleyici: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, 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:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 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:4359
+#: g10/keyedit.c:4600
 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:4386
+#: g10/keyedit.c:4627
 #, 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:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, 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:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 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:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, 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:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, 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:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3707,147 +3715,147 @@ msgstr "çok fazla sıkıştırma tercihi\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "Şifreleme"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "Kimlik kanıtlama"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, 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:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, 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:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3863,7 +3871,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3879,38 +3887,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3918,11 +3926,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:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3938,44 +3946,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 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:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3986,7 +3994,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 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"
@@ -4002,24 +4010,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 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:1738
+#: g10/keygen.c:1787
 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:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4027,12 +4035,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -4044,7 +4052,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -4057,50 +4065,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, 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:2960
+#: g10/keygen.c:3009
 #, 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:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4108,19 +4116,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:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, 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:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4128,26 +4136,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 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:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, 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:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4168,49 +4176,41 @@ msgstr "imza guvencesi: "
 msgid "Critical preferred keyserver: "
 msgstr "Kritik tercihli anahtar sunucusu: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "insan okuyabilir değil"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
@@ -4524,119 +4524,119 @@ msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -5479,30 +5479,30 @@ msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 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"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: %%-genişletmesi imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5510,7 +5510,7 @@ msgstr ""
 "UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5519,22 +5519,22 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5542,17 +5542,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -5810,119 +5810,115 @@ msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[süresi doldu] "
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[bilinmeyen]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[tanımsız]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[şöyle böyle]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[tamamen]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[son derece]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, 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:612
+#: g10/trustdb.c:607
 #, 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:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, 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:2202
+#: g10/trustdb.c:2197
 #, 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:2288
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5930,7 +5926,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6248,6 +6244,29 @@ 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 ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr ""
+#~ "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+#~ "sonuna bir '=' gelir.\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
+
+#~ msgid "not human readable"
+#~ msgstr "insan okuyabilir değil"
+
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
 #~ msgstr "seçenekleri dosyadan okur"
@@ -6720,9 +6739,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "   signed by %08lX at %s%s\n"
 #~ msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Niteleme: "
-
 #~ msgid "Policy: "
 #~ msgstr "Güvence: "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 656b87274..104fa4969 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-03-17 22:24+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -45,10 +45,10 @@ msgstr "正在将私钥写至`%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -81,9 +81,9 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -388,14 +388,14 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "您的选择？ "
 
@@ -561,8 +561,8 @@ msgstr "  (2) 加密密钥\n"
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -582,7 +582,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -590,7 +590,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -642,7 +642,7 @@ msgstr "更改或解锁 PIN 的菜单"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "命令> "
 
@@ -658,7 +658,7 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -703,7 +703,7 @@ msgstr "再次输入此 PIN："
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -713,7 +713,7 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -759,7 +759,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -778,7 +778,7 @@ msgstr "使用对称加密算法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -803,7 +803,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -966,7 +966,7 @@ msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -974,127 +974,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签字"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签字"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "生成一份分离的签字"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "验证签字"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "列出密钥和签字"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签字"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "为某把密钥添加签字"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签字"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签字"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1104,51 +1104,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签字或解密"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1156,7 +1156,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1208,7 +1208,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -1216,7 +1216,7 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "压缩："
 
@@ -1300,481 +1300,470 @@ msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "用户标记名称一定要含有“@”字符\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "用户标记名称一定要含有“@”字符\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "标记值一定不能使用任何的控制字符\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2339,7 +2328,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -2615,51 +2604,51 @@ msgstr "建立‘%s’时发生错误：%s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[自身签字]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签字\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签字\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签字因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2670,17 +2659,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2689,46 +2678,46 @@ msgstr ""
 "请输入这份信任签字的深度。\n"
 "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗？(y/N)"
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2737,75 +2726,75 @@ msgstr ""
 "“%s”的自身签字是 PGP 2.x 样\n"
 "式的签字。\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签字已经过期了。\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签字是一份本地签字。\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签字\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签字\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签字吗？(y/N)"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签字\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 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:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2814,31 +2803,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2847,74 +2836,74 @@ msgstr ""
 "您真的确定要签字这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签字。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签字不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签字会被标记成不可导出。\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签字时失败： %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2922,11 +2911,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2934,180 +2923,186 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "检查签字"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签字"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签字"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签字"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签字"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "设定所选用户标识的首选项"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签字"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3118,241 +3113,249 @@ msgstr ""
 "  信任签字，或‘nr’前缀(nrsign)以添加不可吊销签字，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签字吗？(y/N)"
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签字的用户标识\n"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签字类型‘%s’\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"选项：\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3361,55 +3364,55 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签字吗？(y/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "无效的 ASCII 封装格式"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3418,175 +3421,185 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 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:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "签字标记："
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "是否覆盖？(y/N)"
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3613,147 +3626,147 @@ msgstr "太多首选压缩算法\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "正在写入直接签字\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "正在写入自身签字\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签字\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "签字"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签字\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签字)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签字)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3769,7 +3782,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3785,38 +3798,38 @@ msgstr ""
 "      <n>m = 签字在 n 月后过期\n"
 "      <n>y = 签字在 n 年后过期\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签字的有效期限是多久？(0) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "签字永远不会过期\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签字于 %s 过期\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3824,11 +3837,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3844,44 +3857,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3892,7 +3905,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3907,23 +3920,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3931,12 +3944,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -3948,7 +3961,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -3958,50 +3971,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签字。\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4009,42 +4022,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4065,50 +4078,42 @@ msgstr "签字策略："
 msgid "Critical preferred keyserver: "
 msgstr "关键首选公钥服务器："
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "警告：找到无效的标记数据\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "关键签字标记："
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "签字标记："
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "不是人类能读懂的"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
@@ -4419,118 +4424,118 @@ msgstr "注意：发件者要求您“只阅读不存盘”\n"
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "签字验证已被抑制\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些多重签字\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签字建立于 %s\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签字，来自于“%s”"
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签字，来自于“%s”"
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签字已于 %s 过期。\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签字在 %s 过期。\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签字，散列算法 %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签字：%s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签字\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签字。只检查第一个签字。\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签字\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签字\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -5335,69 +5340,69 @@ msgstr "密钥 %s：没有子钥吊销签字所需的子钥\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签字所需的子钥\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签字内放入标记数据\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入标记数据\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签字内放入策略 URL\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入策略 URL\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签字时发生错误： %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签字来自：“%s”\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签字\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "正在签字："
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签字\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -5652,126 +5657,122 @@ msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, 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:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -6086,6 +6087,27 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\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"
+
+#, fuzzy
+#~ 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 "expired: %s)"
 #~ msgstr "已过期：%s)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a47d722c7..90ea14e5a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+0100\n"
 "PO-Revision-Date: 2005-06-23 02:36+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "正在將私鑰寫至 `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,9 +79,9 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
-#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
@@ -386,14 +386,14 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
@@ -559,8 +559,8 @@ msgstr "   (2) 加密用金鑰\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -580,7 +580,7 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -588,7 +588,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -640,7 +640,7 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
 msgid "Command> "
 msgstr "指令> "
 
@@ -656,7 +656,7 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -701,7 +701,7 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -711,7 +711,7 @@ msgstr "無法開啟 `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -757,7 +757,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1230
+#: g10/encode.c:213 g10/sign.c:1215
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -776,7 +776,7 @@ msgstr "正在使用編密法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
@@ -801,7 +801,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -964,7 +964,7 @@ msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:373
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -972,127 +972,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:375
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1102,51 +1102,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:437
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:439
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1154,7 +1154,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:557
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1212,7 +1212,7 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -1296,480 +1296,470 @@ msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
 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:2921
+#: g10/gpg.c:2893
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "使用者標記名稱一定要含有 '@' 字符\n"
-
-#: g10/gpg.c:4044
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "標記值一定不能使用任何的控制字符\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2346,7 +2336,7 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
@@ -2622,51 +2612,51 @@ msgstr "金鑰區塊資源 `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2676,17 +2666,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2696,45 +2686,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2743,11 +2733,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2756,11 +2746,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2769,53 +2759,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
 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:889
+#: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2824,31 +2814,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2857,74 +2847,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2932,11 +2922,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2944,180 +2934,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "設定所選使用者 ID 的偏好清單"
+
+#: g10/keyedit.c:1432
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3128,221 +3124,229 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"選項:\n"
+" "
+
+#: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
 #: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3350,17 +3354,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
 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"
@@ -3368,7 +3372,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:3011
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3377,54 +3381,54 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3433,172 +3437,182 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
 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:3361
+#: g10/keyedit.c:3412
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3383
+#: g10/keyedit.c:3434
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "簽章標記: "
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "是否覆寫? (y/N) "
+
+#: g10/keyedit.c:4363
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -3625,147 +3639,147 @@ msgstr "壓縮偏好過多\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:864
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:854
+#: g10/keygen.c:903
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:954
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3781,7 +3795,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3797,38 +3811,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3836,11 +3850,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3855,44 +3869,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3903,7 +3917,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -3918,23 +3932,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3942,12 +3956,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
 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"
@@ -3959,7 +3973,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
 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"
@@ -3970,50 +3984,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
 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"
@@ -4021,42 +4035,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4077,50 +4091,42 @@ msgstr "簽章原則: "
 msgid "Critical preferred keyserver: "
 msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "警告: 找到無效的標記資料\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "關鍵簽章標記: "
 
-#: g10/keylist.c:375
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "簽章標記: "
 
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "不是人類能讀得懂的"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
 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:1530
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
@@ -4431,118 +4437,118 @@ msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -5354,69 +5360,69 @@ msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
 
-#: g10/sign.c:113
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:139
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
 
-#: g10/sign.c:147
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
 
-#: g10/sign.c:160
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:188
+#: g10/sign.c:173
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:350
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:359
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:767
+#: g10/sign.c:752
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:836
+#: g10/sign.c:821
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:934
+#: g10/sign.c:919
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1046
+#: g10/sign.c:1031
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1224
+#: g10/sign.c:1209
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -5671,125 +5677,121 @@ msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
 #, 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:2363
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -6104,6 +6106,26 @@ msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\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 "不是人類能讀得懂的"
+
 #  of subkey
 #~ msgid "expired: %s)"
 #~ msgstr "已過期: %s)"